OSDN Git Service

Merge changes I9c735fe2,Ib918b2ed
authorDan Willemsen <dwillemsen@google.com>
Mon, 1 Aug 2016 23:25:29 +0000 (23:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 23:25:29 +0000 (23:25 +0000)
commit6d037230b8f64ad02f351bab5aef269c872d8d96
tree312f9b0df64e8df1325da0e96016f537f5ab06ca
parent644526cfa5c866a01ffc2125ad79103c94e84cf2
parentb51df6d171bee344c55eb57635bca8801d3b4278
Merge changes I9c735fe2,Ib918b2ed
am: b51df6d171

Change-Id: I8b96c237e92fe3c8f4c8e74c2054ea2ed0ff2e45