tree 55c4505038bff95f0c4426091a200f2f9be870df
parent ee5163cb1e5eefb7a7128b256fee92fe4126f234
parent 61a066ad3630b7abe122e41873a873aab9b86a8e
author Xin Li <delphij@google.com> 1532387896 -0700
committer android-build-merger <android-build-merger@google.com> 1532387896 -0700

Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master am: 85b714c876
am: 61a066ad36

Change-Id: If494a86cac3d76a2b7120d91b334ab76cda79bb9