tree 09a382c89d58ac170687b86f24f3ebc3f80698b6
parent 39112a4558de1bce4ac2aab164464073775bbf2f
parent 8a20d7acc00e6865658ae82031049a339297ba7e
author Xin Li <delphij@google.com> 1572153886 -0700
committer android-build-merger <android-build-merger@google.com> 1572153886 -0700

[automerger skipped] Merge Coral/Flame into AOSP master am: 2dd444c395 -s ours
am: 8a20d7acc0 -s ours
am skip reason: change_id I911b1a53ec46f39cc7597c2a31f59669db4f0699 with SHA1 e66c67c549 is in history

Change-Id: If420f667fb082b6bc8d243398d8c7a4607b2c6b5