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)
commitbfaf963337be42a8c5a8493e797a82b074ad47fb
treedbea48569727767c2c3ce78c7c1335a2447a8586
parent503135596bfaadacad2daa4ce066f09ba81a6140
parentc3a209382cc05d532a4872670730023526e2c537
Merge changes I0d0c0fac,Ifb9b00b6
am: c3a209382c

Change-Id: If8f81cc1906668c82c2393e37600a7697cba2a05