| commit | 12eaafd9cf476efc21a73510ce530b5f8a98add6 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Thu Aug 27 05:02:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:02:33 2015 +0000 |
| tree | 5bc92de6f453a0652b1965bdc90e8a78a42a1fcc | |
| parent | 66270b69d4a01f921106588912a492f15fe0d9f4 [diff] | |
| parent | 967b52fb0b4589275d347f8e76bd3fcc9bb209a4 [diff] |
am 967b52fb: (-s ours) am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev * commit '967b52fb0b4589275d347f8e76bd3fcc9bb209a4':