OSDN Git Service

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
authorXin Li <delphij@google.com>
Sat, 9 Jun 2018 09:21:17 +0000 (02:21 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 9 Jun 2018 09:21:17 +0000 (02:21 -0700)
am: 401c4b1d00

Change-Id: If4ace9b12ba9049e9f333aafbdb51610c4f98353


Trivial merge