OSDN Git Service

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

Change-Id: Ia39fa85435347c780403bf111f186a6a00f76d86


Trivial merge