| commit | cdbd990698d1a92da9c83a3ac49e3d297d09c03b | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:43:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:43:58 2014 +0000 |
| tree | 918aa76472024fbb17244a131096e2948158dc63 | |
| parent | e3950823b6126e16158d3c969c2bdd6d914b22dc [diff] | |
| parent | dcf080d571e9b40266a961ddd1a421efecdded1a [diff] |
am dcf080d5: am 56a794f2: am 96e30774: am fea4b4dd: am 3450dc32: am 06018d92: am f41a380b: 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 'dcf080d571e9b40266a961ddd1a421efecdded1a': resolve conflicts for merge 5a7b3b65 correctly