OSDN Git Service

Merge changes I7c48a326,I7395ecd4 into pi-dev
authorLucas Dupin <dupin@google.com>
Fri, 20 Apr 2018 07:38:47 +0000 (00:38 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Apr 2018 07:38:47 +0000 (00:38 -0700)
am: 4e4b6ff508

Change-Id: I90fddaaf9a2fd3027d689bf356d2929c93323d5e


Trivial merge