tree 9ab8088aa7bcbb1f796c5c2e6d0690618361c59d
parent 7bacdb19a1ac6f8d09e1ce0db43093ab1c7ed5ee
parent 1638a0049b4a5edae6aaf73a55a6aa7e14f71075
author Mathieu Chartier <mathieuc@google.com> 1412634863 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412634863 +0000

am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev

* commit '1638a0049b4a5edae6aaf73a55a6aa7e14f71075':
  Fix incorrect JNI_ABORT