OSDN Git Service

Merge changes Ie172ca37,Idf714e51
authorAndre Eisenbach <eisenbach@google.com>
Thu, 2 Feb 2017 18:09:32 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 18:09:32 +0000 (18:09 +0000)
am: 4bfa6b5205

Change-Id: I513824b35ee04268d8b3ec565432b8bb1cb3c736


Trivial merge