OSDN Git Service

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

Change-Id: Ie943428132fbcfcc565d54b46830ed297227ef35


Trivial merge