tree d08005efa6f5393feab6c1ce0401a14da655cb54
parent 1e9c2d8dc59e5270d23a3fb8623baffc1eb25e12
parent 67a03845223ea34c6112e2749e32c7eb670e4cd2
author Xin Li <delphij@google.com> 1528538229 -0700
committer android-build-merger <android-build-merger@google.com> 1528538229 -0700

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

Change-Id: Ie4f86c9a8f764be4b28cdcd87e4679d87c9b0fca