| commit | bba4b99f398d2347a6dd6027794c5161a824b56b | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Sun Sep 20 01:38:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:38:51 2015 +0000 |
| tree | 75affab3545a2543ceb5825191156b58414e40c1 | |
| parent | 805ca9b3516d7f9772fee111f01185f8cb77fbd7 [diff] | |
| parent | 4a287f3a7c723a9cf32ba6cb977e87fce7d794b1 [diff] |
am 4a287f3a: (-s ours) am 5e394f2b: am d514081a: am c391d887: am 943f1c0c: (-s ours) am 7334b956: am 96c55282: am d8b9218c: am 9d0497bd: am 44da08ed: (-s ours) am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev * commit '4a287f3a7c723a9cf32ba6cb977e87fce7d794b1': DO NOT MERGE fix build