tree 3fa6e9e5806306ca4ee43cc1785f4af441c72136
parent f6ddc0c0ad4ce939e8a4451dfd0759bf9a19981f
parent 1eb0fcaf544382777453b9730fe7ee23952af284
author Xin Li <delphij@google.com> 1572154422 -0700
committer android-build-merger <android-build-merger@google.com> 1572154422 -0700

[automerger skipped] Merge Coral/Flame into AOSP master am: 9f99ce7286 -s ours
am: 1eb0fcaf54 -s ours
am skip reason: change_id I94702cae40999e1af4420435a9a95f737a683c61 with SHA1 451682d0ba is in history

Change-Id: Iede8e40d7391ee239eea800d01072d1faa40842c