OSDN Git Service

Merge changes Icd56662d,I0ece820f am: 47ef64b0d2
authorLorenzo Colitti <lorenzo@google.com>
Thu, 15 Feb 2018 11:52:34 +0000 (11:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Feb 2018 11:52:34 +0000 (11:52 +0000)
am: bf66580c0b

Change-Id: I5faf7049c376eb400a41231448d9414471ae6777


Trivial merge