OSDN Git Service

Merge changes Iff142ccd,I724080ed into pi-dev
authorAdrian Roos <roosa@google.com>
Tue, 13 Mar 2018 13:39:07 +0000 (13:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Mar 2018 13:39:07 +0000 (13:39 +0000)
am: 7844159deb

Change-Id: Ia02e8c988b97023079c3bfac57da338b64d3dd37


Trivial merge