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)
commit7d16886c7e9246f09bc1855bc65bb309a2879357
tree6c329f25dfbf1ce938d4412df00ceca256caab5b
parentfb0d750cd19c51e00f9e29f50a947c3ea467da39
parent4188432a7bb065608cf950a2f7602cb4fb8c338b
Merge changes Ie2676b20,Ie8db6f85 am: 61901ddedd
am: 4188432a7b

Change-Id: I4ad3267304977f9956dc33c179c86118252a55b3