OSDN Git Service

Merge stage-aosp-master into pi-dev-plus-aosp
authorXin Li <delphij@google.com>
Mon, 25 Feb 2019 12:08:26 +0000 (04:08 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Feb 2019 12:08:26 +0000 (04:08 -0800)
am: 8e6241e579

Change-Id: I06ac11911c4053dacf64f1ac95a9db9795d99c05


Trivial merge