OSDN Git Service

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

Change-Id: I7f14d89da3fee380de7d4e121ec04a7d2852a33e


Trivial merge