OSDN Git Service

Merge changes Ic4fcbb22,I1be8a18d am: b19f11d09d
authorMyles Watson <mylesgw@google.com>
Fri, 3 Feb 2017 18:32:16 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 18:32:16 +0000 (18:32 +0000)
commit0668f3398e31dbf864846b83177855f94c72a6b7
treee073a0a959162c8d46e0f7a86186706c5cc29603
parentfb9a818cdba96c6ebdd628a6457429db0e96e4e6
parentcb06ecd1d19db9e5a74d70ffc11cbaf8621b1741
Merge changes Ic4fcbb22,I1be8a18d am: b19f11d09d
am: cb06ecd1d1

Change-Id: I0f0e678e04360dc33f7315bc2ade025ee6adf8de