tree 9b84dda5d1497513be8719e3efa276783c0aa1ac
parent 8784af300584b0216855af7fbafd8d9e51dc8e8e
parent df41c3059d3544ec064c8f5c8694a1c21a0c8370
author Xin Li <delphij@google.com> 1572153430 -0700
committer android-build-merger <android-build-merger@google.com> 1572153430 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: df41c3059d -s ours
am skip reason: change_id I67924606d0869a662c93c0e8f27b869c959f621c with SHA1 8784af3005 is in history

Change-Id: I393933fa8f52f46a0894d59840efd700d6b2d766