OSDN Git Service

DO NOT MERGE: Merge Oreo MR1 into master
authorXin Li <delphij@google.com>
Thu, 7 Dec 2017 04:51:27 +0000 (04:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 04:51:27 +0000 (04:51 +0000)
am: d481b28a58  -s ours

Change-Id: I8e2ec84d8e11217b94c2d7bda627be6ba27b3453


Trivial merge