OSDN Git Service

Merge pi-dr1-dev to aosp-master
authorBill Yi <byi@google.com>
Fri, 19 Oct 2018 21:56:47 +0000 (14:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Oct 2018 21:56:47 +0000 (14:56 -0700)
am: 8891a0c1cd

Change-Id: I5f04ae2bdcc90d08541a589fe488c471756ff7ae


Trivial merge