tree 8c519eb12434af7811335362191b00b9f0797e33
parent 14b9349ac8312ce9bee2f109e65e03d5f4eea7f8
parent d3498e30536f1c7a56754b5533a8de6a42f2f8e4
author Xin Li <delphij@google.com> 1572154393 -0700
committer android-build-merger <android-build-merger@google.com> 1572154393 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: d3498e3053 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1 af8a6c724f is in history

Change-Id: I69195e1645a0fd74c3919ab55ff1c171fb51deaf