tree c8c9910c6c6842aff4edd07f365bf2fd68fe4a8c
parent ada62240a62097b621bae219bf280c814004038b
parent 04c290b174674316e324cbc7b6eb4b5675b47634
author Xin Li <delphij@google.com> 1528552921 -0700
committer android-build-merger <android-build-merger@google.com> 1528552921 -0700

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 84fc8cbc7e
am: 04c290b174

Change-Id: Ib03239d4534605a62eeceb621348f0d4b9879665