OSDN Git Service

Merge changes I90451c14,I9fb27a0a into pi-dev
authorAdrian Roos <roosa@google.com>
Mon, 18 Jun 2018 12:39:20 +0000 (05:39 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Jun 2018 12:39:20 +0000 (05:39 -0700)
am: b91dd1d944

Change-Id: I0e33553729a96e597b8e6f8e741b6cae37504175


Trivial merge