OSDN Git Service

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

Change-Id: I0131132b59eb621fc272d31c51b1fc6ab9d91a2a


Trivial merge