| commit | 11c7686f7656e61b7153135cd0c67165948c9c68 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:52:23 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:52:23 2019 -0700 |
| tree | 770c4a32579ba35ad42a450b9d28560fa186b5e0 | |
| parent | 4b2759128d2a19604140162c86ebc8f7909b9a42 [diff] | |
| parent | ab9bc18b3e9dc8661c539c03d235b59578c4c918 [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: 5d959b1498 -s ours am: ab9bc18b3e -s ours am skip reason: change_id Ie78dbefaf12fb00fa8c4d1f352de87b43c7263bb with SHA1 37062b54f3 is in history Change-Id: I38c2c03bb695d709c5dc2f92b9b16e1bc851280f