OSDN Git Service

[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s...
authorXin Li <delphij@google.com>
Sun, 27 Oct 2019 06:54:41 +0000 (23:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 27 Oct 2019 06:54:41 +0000 (23:54 -0700)
am: a69c584aaa -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: If55c2cd2bdc8cd6329ba62e34e8979cdd645e5b3


Trivial merge