OSDN Git Service

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

Change-Id: I5aff9abe8f04dbd5217255de33ae7eebbb5b03bc


Trivial merge