tree 84de8c12121c2a8979b2bfdde2486a8f0ef9e316
parent 73ab0d12ce6a526756df1fe85c8c5cfe31244ad3
parent d8a411c90a2d31e6a5f80105a6095b45c2cc9152
author Xin Li <delphij@google.com> 1528533912 -0700
committer android-build-merger <android-build-merger@google.com> 1528533912 -0700

Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master
am: d8a411c90a

Change-Id: Ifc15b0365a972264e00e49325106ddca7072c1c9