OSDN Git Service

Merge changes Ie2676b20,Ie8db6f85 am: 61901ddedd
authorHugo Benichi <hugobenichi@google.com>
Thu, 14 Sep 2017 12:08:22 +0000 (12:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 12:08:22 +0000 (12:08 +0000)
am: 4188432a7b

Change-Id: I4ad3267304977f9956dc33c179c86118252a55b3


Trivial merge