tree aff2f6e3e6a058639cbbbbc40a1c32fb86f16024
parent b48b4a2fd4e15b3923ac4f400298592108a5d430
parent 4946643f2069fac61f374507ef744316a4bb1a38
author Xin Li <delphij@google.com> 1528535088 -0700
committer android-build-merger <android-build-merger@google.com> 1528535088 -0700

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

Change-Id: I388b6918f86f3a6ca4e887212f742effd10be866