Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
authorXin Li <delphij@google.com>
Fri, 20 Jul 2018 06:23:37 +0000 (23:23 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jul 2018 06:23:37 +0000 (23:23 -0700)
commit161769d6341fac716db60e79e060e4aa1adc471e
treeab2e52acfe67431be552bc142cfbe9f9f8bdde78
parentfa0b72661d9ce435f720ee0d3f1a28253ac61b22
parent49dc66d971a11fb3b1e46a1793f7de23b53aa2d1
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: 49dc66d971

Change-Id: Ief923dd2f8e02c97473381bc886f5bee9d9ff0d4