OSDN Git Service

Merge "Fix 64-bit build failure."
authorDan Albert <danalbert@google.com>
Fri, 22 Apr 2016 20:53:06 +0000 (20:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 20:53:06 +0000 (20:53 +0000)
commitdc868bbc88a4b2d9a7b584c05a18b989f2779e38
tree46e136ec7556c65bdc440e1aa3f558e39d4c1a2e
parentc54109c0891cd6fc645d41ffdbbb4c9b6490bf00
parentaff32398affb154eb5c0cc9d0f84173e1752e9bf
Merge "Fix 64-bit build failure."
am: aff3239

* commit 'aff32398affb154eb5c0cc9d0f84173e1752e9bf':
  Fix 64-bit build failure.

Change-Id: Ic824d6bc63bac513cd8f59cc51b57ded7b51568e