tree 0f6be14605bf591b62328d3f35386d31ceddc7e7
parent a43668eb5f85c5e5d8c953c741697e456d1a418c
parent a4afbb8c46952567713df3534fa451d9bd08956e
author Elliott Hughes <enh@google.com> 1376291629 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376291629 -0700

am a4afbb8c: Handle JNI_ERR results from JNI_OnLoad functions specially.

* commit 'a4afbb8c46952567713df3534fa451d9bd08956e':
  Handle JNI_ERR results from JNI_OnLoad functions specially.