tree f864ff869185b2873637ca70584c66fd6a1e899d
parent 5e09f9a3d72c4bacb0923ee00a13f69446a26dc7
parent a5227a2b35b80f4fc4f4b6a2297283de11f064d6
author Elliott Hughes <enh@google.com> 1376327739 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376327739 -0700

am a5227a2b: am a4afbb8c: Handle JNI_ERR results from JNI_OnLoad functions specially.

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