OSDN Git Service

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

Change-Id: Idf1f5091144d93f88684df50fd38593400b0e23e


Trivial merge