OSDN Git Service

Merge stage-aosp-master into pi-dev-plus-aosp
authorXin Li <delphij@google.com>
Mon, 25 Feb 2019 08:30:35 +0000 (00:30 -0800)
committerXin Li <delphij@google.com>
Mon, 25 Feb 2019 08:30:35 +0000 (00:30 -0800)
Bug: 126125118
Change-Id: If68db2b53dffe4c33f9fb34019020d6253ac0679


Trivial merge