OSDN Git Service

Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 0658146997 -s ours
authorXin Li <delphij@google.com>
Thu, 7 Dec 2017 12:56:41 +0000 (12:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 12:56:41 +0000 (12:56 +0000)
am: 6e2c1bdca4

Change-Id: If4d6ac81a29e6adbc09ecd96fd3b565603251032


Trivial merge