| commit | 10fb4fe400625a95b3bc00b10b92814d7bc6f118 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 20:56:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 20:56:07 2014 +0000 |
| tree | 8f7841b116a23a9eedc7802ab32a1d8da6a45a1a | |
| parent | 31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff [diff] | |
| parent | d99dd3e7322fa0071ca709e71ab34ae54677e3dc [diff] |
am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp * commit 'd99dd3e7322fa0071ca709e71ab34ae54677e3dc': resolve conflicts for merge 5a7b3b65 correctly