OSDN Git Service

Merge stage-aosp-master into pi-dev-plus-aosp
authorXin Li <delphij@google.com>
Mon, 25 Feb 2019 09:47:49 +0000 (01:47 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Feb 2019 09:47:49 +0000 (01:47 -0800)
am: dc39079de3

Change-Id: Id96fa7e4be673be238ce00f16761656b28f0269b


Trivial merge