OSDN Git Service

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

Change-Id: Iabd8d07c4007f802c690fbeaee9edc24dae51842


Trivial merge