OSDN Git Service

DO NOT MERGE: Merge Oreo MR1 into master am: 1843c887d4 -s ours am: 00a2c10b44
authorXin Li <delphij@google.com>
Thu, 7 Dec 2017 22:05:05 +0000 (22:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 22:05:05 +0000 (22:05 +0000)
am: 81daada217  -s ours

Change-Id: I157feb353c48566849a001630ed505dc5911addd


Trivial merge