tree 61a3b7248024bbf31d1f180e9c2477696f042517
parent 45e52b5ab37a26149ce031caa44bb167da217667
parent e706f47d2ea5ec46b5905685b83cb5ef777d0eac
author Xin Li <delphij@google.com> 1528535226 -0700
committer android-build-merger <android-build-merger@google.com> 1528535226 -0700

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: e706f47d2e

Change-Id: I07c839d6c1ef9860dd70d999e92efb1f6bbaa283