OSDN Git Service

Merge changes Ia15f77e2,Icaa1f95c
authorHugo Benichi <hugobenichi@google.com>
Thu, 13 Apr 2017 09:34:22 +0000 (09:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 09:34:22 +0000 (09:34 +0000)
am: c923752929

Change-Id: I98b29c91c68a63d6ddeffd03a690b7e841c2b5bc


Trivial merge