tree d2837f73df03eb9dafc745a6375e5b87c8c51a8e
parent a4af5726c4c8c882ca65a049bfa824922609d464
parent a48985349cb26757b6c4be18acc496ab6d1110e5
author Stephen Hines <srhines@google.com> 1397758847 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397758847 +0000

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

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