tree 871c197be852b08731a34c3c5a45873db3efa3fd
parent 42b7bdc79b898e68a3ed31079310d1599ab34d95
parent 3e72be4138cd714cb0570a2e302ebfa937c48069
author Xin Li <delphij@google.com> 1572153709 -0700
committer android-build-merger <android-build-merger@google.com> 1572153709 -0700

[automerger skipped] Merge Coral/Flame into AOSP master
am: 3e72be4138 -s ours
am skip reason: change_id Ice305db6bf112cd9feeeec0eef3d783e964fd741 with SHA1 42b7bdc79b is in history

Change-Id: Iad67235c457d4cd437294d20a75209e5e0425c95