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)
commitda152fccb0a73029bb777cb9cf3ad3295d8de565
tree61b7ce20c5a3e8866342b3054f3a030ce1e88c70
parentee393feadc7f66edf7b3e8279a90b1b5dacc0dea
parenta69c584aaa62eb4e674dd38a36aa78f5bc7bda52
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours am: c21f19338e -s ours
am: a69c584aaa -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: If55c2cd2bdc8cd6329ba62e34e8979cdd645e5b3