tree 4c827da1dc16242988b590118c48b14aed09da50
parent 5fd1f86be57f678a52bbae8d42142c9b37d92647
parent e3126a727fcd3e9f0d3e598e9c8601afb556a632
author Xin Li <delphij@google.com> 1572158646 -0700
committer android-build-merger <android-build-merger@google.com> 1572158646 -0700

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

Change-Id: If8387cad4e004fade8813d4c67240f4334781383