OSDN Git Service

Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4 -s ours
authorXin Li <delphij@google.com>
Thu, 7 Dec 2017 15:23:18 +0000 (15:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 15:23:18 +0000 (15:23 +0000)
am: 4f83509810

Change-Id: I72dd8e97a660beaca9343cea99ef117a202fdf35


Trivial merge