OSDN Git Service

DO NOT MERGE: Merge Oreo MR1 into master am: 7b017d5a2f -s ours
authorXin Li <delphij@google.com>
Thu, 7 Dec 2017 07:05:14 +0000 (07:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 07:05:14 +0000 (07:05 +0000)
am: 2ba6a22abb

Change-Id: Id5dd78948fe46817fdb0c65b2c4dc8d6536f3a37


Trivial merge