OSDN Git Service

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


Trivial merge