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)
commitd90f892495c2d81e5b35dcbc5ffb0bead74deba5
tree076f4ad4b1f7b249b8210e54b7a7d35432aaae80
parent8a1ad734cd72bd4cb3627f297ea44e8a7da5ea86
parent4bfa6b52055c02080e5252db8835952d0425ae6c
Merge changes Ie172ca37,Idf714e51
am: 4bfa6b5205

Change-Id: I513824b35ee04268d8b3ec565432b8bb1cb3c736