| commit | 9d0497bd4d59cec06f110b159da44fd0c20ad7c5 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Sat Sep 12 08:49:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 08:49:20 2015 +0000 |
| tree | 72ba29a15f2425c09402c3de5ee0970745714023 | |
| parent | 644f4076dd9452ac6e5596b111ec9e6386f5d0a4 [diff] | |
| parent | 44da08ed957157645e1c8776bb59924b1bb7f61c [diff] |
am 44da08ed: (-s ours) am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev * commit '44da08ed957157645e1c8776bb59924b1bb7f61c': DO NOT MERGE fix build