tree 09a382c89d58ac170687b86f24f3ebc3f80698b6
parent a983b7390516a4a29e1830061158bc2f53918395
parent 2ec685c0d03745c7d25ca439025db7f53ffe6e3d
author Xin Li <delphij@google.com> 1572154302 -0700
committer android-build-merger <android-build-merger@google.com> 1572154302 -0700

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

Change-Id: I9b0dfa49c9c22d2288ba8fd7db096857e79e2167