tree d8c0309de83c62c2b3b461f04afe834b7d36de0a
parent 69839c0bfab19e7ca621ddee403b5a0a84749c87
parent 727c2c03c85f0fe4ce13bcbc012d3097c1bebd79
author Andreas Gampe <agampe@google.com> 1505952962 +0000
committer android-build-merger <android-build-merger@google.com> 1505952962 +0000

Merge "Nativehelper: Fix ScopedLocalRef" am: 7afb45427e
am: 727c2c03c8

Change-Id: I60a362684c5b44d59ed4c04cf37b2aa40b3b1a9e