| commit | 0780b258705d57d67ea1f03b4c62fe9bc4a10f48 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Tue Jan 15 19:55:23 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 15 19:55:23 2019 -0800 |
| tree | 03b3f68845035126136cffc76ddc97d90a337743 | |
| parent | 4180876be42bb7708f8a1e68ab3a82efce174f8b [diff] | |
| parent | bcfa1bfe3d1d670497fd4f73149eaf6dff689e69 [diff] |
[automerger skipped] resolve merge conflicts of c564b6e118905cd6e5000215ddcd58266c57890a to pi-dev-plus-aosp am: bcfa1bfe3d -s ours am skip reason: change_id I96f74d938663d579e4fea1eee6a4a250d7e21b3a with SHA1 f6bedc23ae is in history Change-Id: I300eb4cee847c476fdc8126be92d34e0ef41fe7e