tree ee3b2d45688c1dc82650b2498a754d0264fc952e
parent cbc7168e55fd4058647af5a6ca7652bb99b299b0
parent fc45b664d421553042629d24086a144761c7b5e1
author Stephen Hines <srhines@google.com> 1397777634 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397777634 +0000

am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."

* commit 'fc45b664d421553042629d24086a144761c7b5e1':
  Fix improper use of JNI_ABORT for operations where Java objects are written.