tree 84de8c12121c2a8979b2bfdde2486a8f0ef9e316
parent 4fed385c6c7146ba4d0c2f8953a29556922136b6
parent d320d12235e55e68263078a227c3d39df67a8021
author Xin Li <delphij@google.com> 1528546606 -0700
committer android-build-merger <android-build-merger@google.com> 1528546606 -0700

Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master am: d8a411c90a
am: d320d12235

Change-Id: Ie8013b062620dd6efd5d018527314c301120238f