OSDN Git Service

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
authorXin Li <delphij@google.com>
Fri, 8 Jun 2018 18:08:00 +0000 (11:08 -0700)
committerXin Li <delphij@google.com>
Fri, 8 Jun 2018 18:08:00 +0000 (11:08 -0700)
Bug: 79597307
Change-Id: Id6fa79ad43862c576599c72ee5b995104e68de0d


Trivial merge