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:02 +0000 (11:08 -0700)
committerXin Li <delphij@google.com>
Fri, 8 Jun 2018 18:08:02 +0000 (11:08 -0700)
Bug: 79597307
Change-Id: Ibb6c6e3f775ee19127711fcc10b2e00a2289a026


Trivial merge