tree 7974b9ccafbb56a3867ece64defed98f33a87541
parent 48d7cfa995e39d124ca586b60adf931e26d4d36c
parent 8c11059c01c490ba2166f560dfa3616d78a575dd
author Xin Li <delphij@google.com> 1528536696 -0700
committer android-build-merger <android-build-merger@google.com> 1528536696 -0700

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

Change-Id: Ia0847672c94d62a0e2bbacf912beae8e219950cd