tree fbffb54c6115663f190dda850a2e194890ff7263
parent 0d05cd931476e43c60b8b9ceb81e68d3202a368a
parent 1a1096f12bccc2f742ca24ac7dbb7d3588054d41
author Xin Li <delphij@google.com> 1528534866 -0700
committer android-build-merger <android-build-merger@google.com> 1528534866 -0700

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

Change-Id: I4c9ee556c042ca4efd520fda65016ee55718a467