OSDN Git Service

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

Change-Id: Iade198360cbd966d01c327baa8bbc5c5b83b5563


Trivial merge