tree 5ad881260ec56920e1f54689ee9ddd4cff68c4c8
parent fa7e82d3ddd016a06a172c60dcc6d5f656dd7be5
parent 9fd0a9c1aefb157ccffe04db006c573067a624bb
author Elliott Hughes <enh@google.com> 1378509258 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378509258 -0700

am 9fd0a9c1: am 3b99337e: Merge "Support apps that pass JNI_VERSION_1_1 to GetEnv." into klp-dev

* commit '9fd0a9c1aefb157ccffe04db006c573067a624bb':
  Support apps that pass JNI_VERSION_1_1 to GetEnv.