tree 09a382c89d58ac170687b86f24f3ebc3f80698b6
parent e66c67c549e9f29fafbe4d8e9098fc59cbd63ae8
parent 2dd444c395c7cceaae8fc9b681cbec1af67ce23b
author Xin Li <delphij@google.com> 1572152918 -0700
committer android-build-merger <android-build-merger@google.com> 1572152918 -0700

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

Change-Id: Ic771df24fbdef9c4aefbdfc5993b4b0ca9f499b7