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