tree 1c79cd4de44e49fadca1fc82625241f6f9593f5c
parent ce14fbc7ffbce4b38e1a5d0280b29ce0f35eb7f1
parent 68c8851687e5c9d9b73c888d54708fabe901f814
author Xin Li <delphij@google.com> 1572154519 -0700
committer android-build-merger <android-build-merger@google.com> 1572154519 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: 68c8851687 -s ours
am skip reason: change_id I8fce5a4b988354cd3275a58a19a6244fa9bf639c with SHA1 e9b70bfbf2 is in history

Change-Id: I323acea4170cb164cc8ad9eb116a2a8a17d55f73