OSDN Git Service

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

Change-Id: I5cd71e856c80c861d464c199dc41332ac6651f33


Trivial merge