tree 4636be449efadb5e81aa55792c26920accaa86cf
parent 07bebe8b12555ea0fb57729e8ee2e7efc343e7e2
parent 472512f6970fa170e2e1a3e1c24ac2b742e2e6b6
author Jean-Baptiste Queru <jbq@google.com> 1329191752 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329191752 -0800

am 472512f6: Merge "Fix incorrect prototype for JNI call"

* commit '472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
  Fix incorrect prototype for JNI call