OSDN Git Service

Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 350f920753 -s ours
authorXin Li <delphij@google.com>
Thu, 7 Dec 2017 13:37:53 +0000 (13:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 13:37:53 +0000 (13:37 +0000)
am: edb2373362

Change-Id: I3be76a44c0308df386d284dfca0022dc7fd890b6


Trivial merge