tree 71830f435bec7f50586d9fcccf5004b6dfb55ca7
parent 7f947233f64e8f60a77b73827564f2521c2fc3fd
parent c9695a5aee19d440731658e88dc5e959b6e4c40a
author Xin Li <delphij@google.com> 1572158243 -0700
committer android-build-merger <android-build-merger@google.com> 1572158243 -0700

[automerger skipped] Merge Coral/Flame into AOSP master am: 5d959b1498 -s ours am: ab9bc18b3e -s ours am: 11c7686f76 -s ours
am: c9695a5aee -s ours
am skip reason: change_id Ie78dbefaf12fb00fa8c4d1f352de87b43c7263bb with SHA1 37062b54f3 is in history

Change-Id: Ia78f05478c5b81c9398edfd676546dfb652512ca