am 5ade30e8: am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
am 5ade30e8: am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev

* commit '5ade30e82e05c783d74e3a52316be4c3ed11239c':
  Fix incorrect JNI_ABORT

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base