OSDN Git Service

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

Change-Id: I338fcdc0e925551e95e073956e3dc699a9331f78


Trivial merge