tree d8343479b767bb0e9e53a31bb949442182b11ac4
parent 69ee6b0a774346af5e621907a0508c02468b4186
parent eacaa353e83942d3c59d0db594df0fb6179e0eea
author Mark Salyzyn <salyzyn@google.com> 1398377831 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398377831 +0000

am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues"

* commit 'eacaa353e83942d3c59d0db594df0fb6179e0eea':
  jni: android_util_Process 64 bit issues