| commit | f57871f799300614d37e93e376f9381fd01c2bcb | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed May 14 00:11:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:11:08 2014 +0000 |
| tree | db1d70339fbb4d596b2c1ed38a86eac2f70434db | |
| parent | 98822f0eba746b4f8c8a622f21c2d32dad08453f [diff] | |
| parent | 888dad0df765256f4b47268400425103106894f0 [diff] |
am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit '888dad0df765256f4b47268400425103106894f0': Fix build due to incorrect merges [DO NOT MERGE]