OSDN Git Service

Merge changes I0d0c0fac,Ifb9b00b6
authorLorenzo Colitti <lorenzo@google.com>
Tue, 16 Jan 2018 18:32:39 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Jan 2018 18:32:39 +0000 (18:32 +0000)
am: c3a209382c

Change-Id: If8f81cc1906668c82c2393e37600a7697cba2a05


Trivial merge