tree cd524d1c44ed5ba56e86e6ff9a0fbf7505cc0160
parent 635b838f348ecbb6b39fdf068773d1661a48aa85
parent 96e07a57d93174953cff776985400ca97408c8da
author Xin Li <delphij@google.com> 1572153130 -0700
committer android-build-merger <android-build-merger@google.com> 1572153130 -0700

[automerger skipped] Merge Coral/Flame into AOSP master am: 53d4c6dbc5 -s ours
am: 96e07a57d9 -s ours
am skip reason: change_id I26e13dd88b006577b73f2528aaa5940492f45f7c with SHA1 de05c1aee5 is in history

Change-Id: Ie03dc4266fe543293b23dea163a8498e940f1e37