OSDN Git Service

Merge changes Ia9b1d24c,I86980cd2 am: 5f1f3557aa
authorRoshan Pius <rpius@google.com>
Fri, 13 Jan 2017 17:00:14 +0000 (17:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 17:00:14 +0000 (17:00 +0000)
commit6e53f36513cea462f048efc70deab8795d485136
tree5a2122d65a201e63b6d0452877cc47e340f081b0
parentbee11f4d5f4a24d6d995edec700cd0d183889c2a
parent1e741476668829852e792f3ca5359c39a7c60389
Merge changes Ia9b1d24c,I86980cd2 am: 5f1f3557aa
am: 1e74147666

Change-Id: I474664d604f50354f3ba8d0a4f84796d3643ccd6