OSDN Git Service

[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s...
authorXin Li <delphij@google.com>
Sun, 27 Oct 2019 07:08:45 +0000 (00:08 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 27 Oct 2019 07:08:45 +0000 (00:08 -0700)
commitc4902f34c03ce36304316dc3574bf424d1fc1841
tree97379d5c923fc799b21e9a4711f4bcf4161c33f5
parent387257af366122c6bd0cac0836439a6ff1379a13
parentda152fccb0a73029bb777cb9cf3ad3295d8de565
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours am: c21f19338e -s ours am: a69c584aaa -s ours
am: da152fccb0 -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: Ic687ebd01c5357d1f06b4f968bb76a8377258961