| commit | 15a43f5d3f465b31b135cfbd3267b72386e26879 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:03:06 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:03:06 2019 -0700 |
| tree | 306185886e403e74dd0c58b510109152ce820966 | |
| parent | 39a110a33026bf87b0101d964f1cb115e566b20e [diff] | |
| parent | 0ad8503833dcabd22540ff9414fb283120050f11 [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: 401b47878c -s ours am: 0ad8503833 -s ours am skip reason: change_id Iccdbb0b411486412558738c43dbb47dab1bdad72 with SHA1 f456b5a32c is in history Change-Id: I83c38fe26fe669772c2521a4b76511d247e4b110