OSDN Git Service

DO NOT MERGE: Merge Oreo MR1 into master am: 777f94aede -s ours am: ae4316c668
authorXin Li <delphij@google.com>
Thu, 7 Dec 2017 22:00:09 +0000 (22:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 22:00:09 +0000 (22:00 +0000)
am: 8c6b858710  -s ours

Change-Id: I8149894990b3010ed731ab9ca7e021d4e4397f34


Trivial merge