OSDN Git Service

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

Change-Id: I5d4b173bce5e72a445c2519fe4b19f5a2aacc7b2


Trivial merge