| commit | f73dbcc3780fbfb6a9eab7d43aebc3607ad1e8f8 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed May 14 00:26:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:26:43 2014 +0000 |
| tree | 0cb3548acfc14db731ce83d7fe3a3da174e90a2f | |
| parent | c289ec6b465648d7d93e6f2dc9ed28822683f7d6 [diff] | |
| parent | 9916c17e6606607bbadacc4fb113018ecb7fcb41 [diff] |
am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit '9916c17e6606607bbadacc4fb113018ecb7fcb41': Fix build due to incorrect merges [DO NOT MERGE]