| commit | 41e4fe0ce7c98890ed0bd78325a09603cb3b15ca | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 24 22:18:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 22:18:57 2015 +0000 |
| tree | 2323c1e1a5d0193984662cf24e790a1a7502f786 | |
| parent | 596922e5d236ac935ecc554ad721ad8a0651dd58 [diff] | |
| parent | ee871fb20be2ab2aaefeddbef7f6ffed7d945710 [diff] |
am ee871fb2: (-s ours) am c10dfe8a: (-s ours) Merge "DO NOT MERGE ANYWHERE fixed all merge issue" into lollipop-mr1-cts-dev * commit 'ee871fb20be2ab2aaefeddbef7f6ffed7d945710': DO NOT MERGE ANYWHERE fixed all merge issue