OSDN Git Service

Merge stage-aosp-master into pi-dev-plus-aosp
authorXin Li <delphij@google.com>
Mon, 25 Feb 2019 13:20:22 +0000 (05:20 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Feb 2019 13:20:22 +0000 (05:20 -0800)
am: b0394d2df7

Change-Id: I923f3565ca3a8c9ffaaa1a55247066d1b1ea6a0d


Trivial merge