| commit | 80816bfcaf487535a45a7e6f271341eaede653b1 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed May 14 00:31:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:31:20 2014 +0000 |
| tree | 903be8cec8423a1e273a4cfd43a2bc5dc4c6de4f | |
| parent | 7dfe1fdac6f0306e1e31417d58a1a36d4280d2cc [diff] | |
| parent | f73dbcc3780fbfb6a9eab7d43aebc3607ad1e8f8 [diff] |
am f73dbcc3: 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 'f73dbcc3780fbfb6a9eab7d43aebc3607ad1e8f8': Fix build due to incorrect merges [DO NOT MERGE]