OSDN Git Service

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
authorXin Li <delphij@google.com>
Sat, 9 Jun 2018 11:01:04 +0000 (04:01 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 9 Jun 2018 11:01:04 +0000 (04:01 -0700)
am: c2e1ca1aac

Change-Id: I66031f4bd7b288e4ab6564939a238bcfc31ab9e7


Trivial merge