| commit | f41a380bd97a25bee1804e43e8deba74fa100163 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:07:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:07:45 2014 +0000 |
| tree | 9f0656aa265f819db9090e2b2cc79f6891744bee | |
| parent | ef24a5091b63fb512d4ca9eb34df6394c3842d33 [diff] | |
| parent | d10ca17d6feefd449595df1cb11d161c8f10dd57 [diff] |
am d10ca17d: 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 'd10ca17d6feefd449595df1cb11d161c8f10dd57': resolve conflicts for merge 5a7b3b65 correctly