OSDN Git Service

Merge changes I90c211dc,I4455f272 am: a0ff4efc8b
authorHugo Benichi <hugobenichi@google.com>
Tue, 4 Jul 2017 09:42:51 +0000 (09:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Jul 2017 09:42:51 +0000 (09:42 +0000)
commitd0e5f1d28047b5852e7aaf9903cebf0e22f21823
treef14795d957367aa08c09145cc4039cb6f074eb9f
parent48360082bc747320f3da3f4c495a4a8299263479
parent2c856480a0c092dcc082d9fc8808fcb120c3a72b
Merge changes I90c211dc,I4455f272 am: a0ff4efc8b
am: 2c856480a0

Change-Id: Ifc74828ff2932b3c1043ed27bc2f9a5fda32e3ee