OSDN Git Service

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: b11752bba7
authorXin Li <delphij@google.com>
Sat, 9 Jun 2018 13:27:31 +0000 (06:27 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 9 Jun 2018 13:27:31 +0000 (06:27 -0700)
am: 0687b77bdb

Change-Id: I972f44b21097084145c1c3f7bf3576f79b430bd5


Trivial merge