| commit | 29ad2629e6d5d54b1c08ba30e94d1bc06674f278 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Sep 24 18:08:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 18:08:39 2015 +0000 |
| tree | c7172039125c29241f3c547a0b35a29d674e994f | |
| parent | 298fa147e0654427295ca34528140845bd34b1e8 [diff] | |
| parent | 4076177ec4d0ccfab8c91efd2256b5cbd5720458 [diff] |
am 4076177e: (-s ours) am 89820f25: am 67762367: Merge "DO NOT MERGE: fixed breakage" into lmp-mr1-dev * commit '4076177ec4d0ccfab8c91efd2256b5cbd5720458': DO NOT MERGE: fixed breakage