OSDN Git Service

[automerger skipped] Merge Coral/Flame into AOSP master
authorXin Li <delphij@google.com>
Sun, 27 Oct 2019 05:33:13 +0000 (22:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 27 Oct 2019 05:33:13 +0000 (22:33 -0700)
am: d3498e3053 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1 af8a6c724f is in history

Change-Id: I69195e1645a0fd74c3919ab55ff1c171fb51deaf


Trivial merge