tree 2f1d8922e39f381fa969ea991858aa983d35206e
parent ae6daf6ea446ba4f32a0738299bfe9bc4e9e3e65
parent dbae2f7b4be4948874bc6442333f43dc51d22407
author Xin Li <delphij@google.com> 1572153056 -0700
committer android-build-merger <android-build-merger@google.com> 1572153056 -0700

[automerger skipped] Merge Coral/Flame into AOSP master am: 629ea98243 -s ours am: 77f824bdef -s ours
am: dbae2f7b4b -s ours
am skip reason: change_id I8e09417ee05af6047a28f0cf837b63a5b5e99194 with SHA1 cbae870f8d is in history

Change-Id: I12720f87ae284927ed47787097c5dfc42c04254d