tree c6c29b39248991706cab357a8752be3bc9fe17ac
parent 8c3e1a9bd01f88a8ef991cc27cc59b7fcf128df3
parent be0e1c782653855c4719b87e459f755c8a0083ad
author Xin Li <delphij@google.com> 1572158423 -0700
committer android-build-merger <android-build-merger@google.com> 1572158423 -0700

[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 1aed8b369d -s ours am: 58eb845999 -s ours
am: be0e1c7826 -s ours
am skip reason: change_id I96a71b7a888dac84188d7e546b0bfb9082711da8 with SHA1 091d81511b is in history

Change-Id: I05c3691ee81bc00fbe10c8a814f4b0aaf4ab61e9