| commit | c391d8871eb63afa0c505b54ddcc6910ef2f8844 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Sun Sep 20 01:00:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:00:21 2015 +0000 |
| tree | 05f56e70007b9fdd0df14a7f72e69c755ea33df8 | |
| parent | c7b2c9c80d6b67a7a00cf89bd4df29a2d25cb494 [diff] | |
| parent | 943f1c0c46f7d4cd52f9d95a74ad3815ec4cea2e [diff] |
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 '943f1c0c46f7d4cd52f9d95a74ad3815ec4cea2e': DO NOT MERGE fix build