| commit | 397089450f8a5c574c134a1747042cd9da7847e7 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 21:16:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:16:59 2015 +0000 |
| tree | 4af660acb1f3bfc9054913ee53c86378a0a420c9 | |
| parent | fae51dd6bc97ecf7d64a458b63761dc71f471511 [diff] | |
| parent | dec9937e560cf4eec0a9f7edc85c0d38cf4964ee [diff] |
am dec9937e: am 93aca245: am 7525014b: am 288cbe6b: am 4fca7a54: am d1c3be52: am c4b4f5f1: am 379468d3: resolved conflicts for 07831126 to lmp-mr1-dev * commit 'dec9937e560cf4eec0a9f7edc85c0d38cf4964ee': Fixed android.uirendering package in CTS-5.0_R3