OSDN Git Service

Merge changes from topic "am-8e33397accdd42de824f0124a3f51007" into pi-dev-plus-aosp
authorJeff Sharkey <jsharkey@android.com>
Tue, 3 Apr 2018 04:36:06 +0000 (21:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 04:36:06 +0000 (21:36 -0700)
am: ec5fab7006

Change-Id: I0c460b27edeb8d0db734d1c8092e7eb866e656cd


Trivial merge