tree 4092521851d2ae3bb1ecfd24c26ea15a5728da3e
parent 6347233c505d88bc9ccd4b1708f835a1512518fb
parent d0a4f2e8e509394955e731985055ee00e8d94472
author Xin Li <delphij@google.com> 1528552884 -0700
committer android-build-merger <android-build-merger@google.com> 1528552884 -0700

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 2a5bbd5b73
am: d0a4f2e8e5

Change-Id: Ibd1b2af5d12fb5e77394c8f2f71dab6daf5f5aba