tree cd524d1c44ed5ba56e86e6ff9a0fbf7505cc0160
parent 55961d923a4ec819b2b2c8d29c16cada8b067845
parent 4e4f227db57822747b097c83096f5590b4f90772
author Xin Li <delphij@google.com> 1572153920 -0700
committer android-build-merger <android-build-merger@google.com> 1572153920 -0700

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

Change-Id: I88e694085a83194aa9eb68d3303f9398878e5109