OSDN Git Service

Merge "Fix 64-bit build failure." am: aff3239 am: dc868bb
authorDan Albert <danalbert@google.com>
Fri, 22 Apr 2016 21:10:29 +0000 (21:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 21:10:29 +0000 (21:10 +0000)
am: 4178b27

* commit '4178b2714c76dac0e63894a4d6d0c55f54230c0d':
  Fix 64-bit build failure.

Change-Id: I0bd4ed28e60e82745d7882bd548f8edcff02b3a7


Trivial merge