tree 33d151b914cdb28e17e3febf0a284f22f04ed95e
parent 88aaba3e1580671135ada4e71ba0f9f3cc3f8c28
parent 970834024be304394e958c7fc6d9180b8fe1e294
author Xin Li <delphij@google.com> 1572152586 -0700
committer android-build-merger <android-build-merger@google.com> 1572152586 -0700

[automerger skipped] Merge Coral/Flame into AOSP master am: 13ca467371 -s ours am: cc13534a4e -s ours
am: 970834024b -s ours
am skip reason: change_id I94e8a8cdab3c666e8c741dd03db5e6ffd477a4ca with SHA1 81c0c27570 is in history

Change-Id: I56cc413ea4f6f0fbfffc5c0f82a581c8ebaa378e