OSDN Git Service

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

Change-Id: Idfac165fa00fc76408d4b0c98fc3e398bb0fc91d


Trivial merge