| commit | d10ca17d6feefd449595df1cb11d161c8f10dd57 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:02:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:02:23 2014 +0000 |
| tree | 564f2b4bd26af36a9f21dc9ed687580246c654c3 | |
| parent | 900954e3cd135bf43db975961056e7661f26a6c6 [diff] | |
| parent | 8921409a05c0e52ba453d3c4f37a9506fde9b321 [diff] |
am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp * commit '8921409a05c0e52ba453d3c4f37a9506fde9b321': resolve conflicts for merge 5a7b3b65 correctly