OSDN Git Service

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

Change-Id: I852ab9b92bb553cc7f2fc6c5dd556e75356020b0


Trivial merge