tree 9fe8ed728f052a5ee8d715f9f3d5b2b3addf4141
parent cf5c9907f580455d925c388339a2d69630242fd9
parent 12e0362fd8f555058ea112f2631e17af7d647754
author Xin Li <delphij@google.com> 1528542686 -0700
committer android-build-merger <android-build-merger@google.com> 1528542686 -0700

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

Change-Id: I0f4e22435cd6b2f9beca188011cd3cdffab55671