OSDN Git Service

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


Trivial merge