| commit | dac5ad296077e781c9e8eee386b40e4c3776efae | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 23 02:22:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 02:22:09 2015 +0000 |
| tree | a54a1e1e7f2d2d22dc23d0b2ff30dd5074e0aa84 | |
| parent | ea930f8069434fddc1ff284d9d622e3a5f77422e [diff] | |
| parent | af32257cf867b180389e969bc22dfbbda8c8d8ce [diff] |
am af32257c: am fa6c1539: am 97836b1e: am 80c60902: am e8eded12: resolved conflicts for 4c7fd94a to mnc-dev * commit 'af32257cf867b180389e969bc22dfbbda8c8d8ce': DO NOT MERGE: fix breakage