OSDN Git Service

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


Trivial merge