tree 9559b734fff58474da26f4f2eee82022ef2946d3
parent 3fc1156f88a7422bbf22f09428b1300df97b77cf
parent 0f6615fe052a499ff7d6e6583a2f66aeb6146f1e
author Mathieu Chartier <mathieuc@google.com> 1386109026 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386109026 -0800

am 0f6615fe: Merge "Fix incorrect IsHeapAddress in jni entrypoints."

* commit '0f6615fe052a499ff7d6e6583a2f66aeb6146f1e':
  Fix incorrect IsHeapAddress in jni entrypoints.