OSDN Git Service

[automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours
authorXin Li <delphij@google.com>
Sun, 27 Oct 2019 05:54:29 +0000 (22:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 27 Oct 2019 05:54:29 +0000 (22:54 -0700)
commitb462c16fb6be42aa323543c9cc4e1f495779fd30
tree61b7ce20c5a3e8866342b3054f3a030ce1e88c70
parentd1823f16c81c1135d7415afdd1253bfbbf04341b
parent119618a381c63e83e05ad6ae583251c90672571c
[automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours
am: 119618a381 -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I6719833c4f030b7cf0d14dce49956ea3f8362c1a