tree 55c4505038bff95f0c4426091a200f2f9be870df
parent 320a8ceb7c00aef8f83bb5c67418ffa3949c58f0
parent 85b714c876acf13b40c4f0f2ba35abe6537d0ba7
author Xin Li <delphij@google.com> 1532379985 -0700
committer android-build-merger <android-build-merger@google.com> 1532379985 -0700

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

Change-Id: I91da2b1096a4600ad780e78e2e55e17b55a7069f