tree e0533df5c02b17799ab94821e4a1f54ecd076796
parent dab68bb62c5dd4f52d82d4c8a406fe1af40748c5
parent 13ca467371e71b39f9fbc38b95504e7a0d5d6326
author Xin Li <delphij@google.com> 1572151643 -0700
committer android-build-merger <android-build-merger@google.com> 1572151643 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: 13ca467371 -s ours
am skip reason: change_id I94e8a8cdab3c666e8c741dd03db5e6ffd477a4ca with SHA1 81c0c27570 is in history

Change-Id: Id765cbfcfeb7e5e5edf55f185cb351db20813068