OSDN Git Service

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

Change-Id: I229b0f5c1c473ae16867896dd8a722fef9b53a6c


Trivial merge