tree 28458a3aa3ae27b497830d58c31a2c82e9e68cca
parent ab8b1013a99940621d412b77c2726240ef09494e
parent 65c1ecb96172228ae18e60c7c56f0049e07703aa
author Xin Li <delphij@google.com> 1572153609 -0700
committer android-build-merger <android-build-merger@google.com> 1572153609 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: 65c1ecb961 -s ours
am skip reason: change_id Idff1f3caff103926cd2cb267dab1d96bbb4daf33 with SHA1 ab8b1013a9 is in history

Change-Id: I1abd22c76dbdcbf7f5ff26c5b0489107e1249534