OSDN Git Service

Merge "Fix 64-bit build failure." am: aff3239
authorTreehugger Robot <treehugger-gerrit@google.com>
Fri, 22 Apr 2016 21:04:11 +0000 (21:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 21:04:11 +0000 (21:04 +0000)
commit4178b2714c76dac0e63894a4d6d0c55f54230c0d
treee77d2716492af104ff7cfd59a42473fd188e81c6
parent046256428f82c8e48444906f8ac8aa5791603e29
parentdc868bbc88a4b2d9a7b584c05a18b989f2779e38
Merge "Fix 64-bit build failure." am: aff3239
am: dc868bb

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

Change-Id: I94ef98339b4203b46df54c6b9c2bfebd70c71989