tree d8c0309de83c62c2b3b461f04afe834b7d36de0a
parent 7bccf1955688943d0ad03a3ce3af59239a0e84c2
parent 11be1ee1cf41cf1842e8a175725137b6f2e4cf0a
author Andreas Gampe <agampe@google.com> 1505967645 +0000
committer android-build-merger <android-build-merger@google.com> 1505967645 +0000

Merge "Nativehelper: Fix ScopedLocalRef" am: 7afb45427e am: 727c2c03c8 am: 2f1df33912
am: 11be1ee1cf

Change-Id: I434f3c6f9d01c25982ab6563ddf4ff6ac1a31bf7