tree 95e707aad3a2b889c118effce8e02eebfe75b0ea
parent 6d14b39680587b8e5e9271d04ca57b239c6b504d
parent 8021732ca7273e9b0c157f6bf4a92d1ea78a68bc
author Xin Li <delphij@google.com> 1572153409 -0700
committer android-build-merger <android-build-merger@google.com> 1572153409 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: 8021732ca7 -s ours
am skip reason: change_id I6f659f61e70630236cabf7a00af39ae2c2c7264c with SHA1 6d14b39680 is in history

Change-Id: I28526dc1d4f2066ab142a8ea9211c823d736bd9c