| commit | 8b87db029c9f51e42a69885f4bd0ae188a1184e8 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Sun Sep 20 00:10:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 00:10:41 2015 +0000 |
| tree | 9ce60cb5b949ba2541ff037dd69d86bd27c1e5cd | |
| parent | a92114448b47bfcb2df0014800e2f4fde9eaabcf [diff] | |
| parent | 40825b787351dd0db1281c74091dcdfa7402274d [diff] |
am 40825b78: am b44c2026: am a38ac188: am a333975e: resolved conflicts for b7c771fc to lmp-dev * commit '40825b787351dd0db1281c74091dcdfa7402274d':