tree 1267c69237f02d2262ea96dbbf6d7d23f9f9a0bf
parent 08b82a99de4dfeb0a74b0922051f46516ca85398
parent 9c750f9b6283f62b3e6a93c0c6b2838abde5000e
author Elliott Hughes <enh@google.com> 1333653555 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1333653555 -0700

Merge "Ensure we don't AddLocalReference a bogus value when returning to native code from an upcall that threw." into ics-mr1-plus-art