OSDN Git Service

[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: e2c2504c94 -s...
authorXin Li <delphij@google.com>
Sun, 27 Oct 2019 06:43:38 +0000 (23:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 27 Oct 2019 06:43:38 +0000 (23:43 -0700)
am: 980b9a285d -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: Ibc1e435c217a9425de09d873070e55bf95f2a2b5


Trivial merge