tree a0e61c1daa3afd68382dca8af4cb3ebc3b79907b
parent f0aa4cc0f257448f76e9d90b97abf9682e930fbf
parent 7325863013e5c34d493e4e92ecadf4fea87554e7
author Mark Salyzyn <salyzyn@google.com> 1397775445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397775445 +0000

am 73258630: Merge "jni: binder 64-bit compile issues"

* commit '7325863013e5c34d493e4e92ecadf4fea87554e7':
  jni: binder 64-bit compile issues