OSDN Git Service

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

Change-Id: I2f6f5a1a9bd7d7cfec92539c7a8cc2f9b5185683


Trivial merge