tree 6361c2c6c31932ac127823d227fc33f55ce477c0
parent 18a432587ceab8e49f9b6e83c2d06ba9e9124e04
parent 77918ad62923ebce31d75b1c028f7eef4248977a
author Xin Li <delphij@google.com> 1572154472 -0700
committer android-build-merger <android-build-merger@google.com> 1572154472 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: 77918ad629 -s ours
am skip reason: change_id Ia3ddfe73a2fa32723e809f74bb83ff43d2c11df9 with SHA1 1d93206c5b is in history

Change-Id: Ia6c3bcbc8f4eda652cbbaa81d9a8e1521ac1efa2