tree c102c810e2021639c94433ac8cc6acd85f7c3903
parent cbae870f8da794efb593cd629faa1dfce659da64
parent 629ea982433eb7ebb9dc1f6b2a9c56b924fd14eb
author Xin Li <delphij@google.com> 1572152271 -0700
committer android-build-merger <android-build-merger@google.com> 1572152271 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: 629ea98243 -s ours
am skip reason: change_id I8e09417ee05af6047a28f0cf837b63a5b5e99194 with SHA1 cbae870f8d is in history

Change-Id: I2f61370ecb671b47c723fdd6f7096eb4bd52a757