tree 84de8c12121c2a8979b2bfdde2486a8f0ef9e316
parent 165a197cdfc71a69d32111dc1fa86b637495604b
parent b5c2c714f08650c6837733b3193bb47f18b35b3b
author Xin Li <delphij@google.com> 1528499399 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1528499399 +0000

Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master