tree 860bf7d248a0b4c9793e90a946836d3715b0aec6
parent 95e6c4663c640c67a69e1d2b44696753282136f8
parent 1b6a90285a4bf84e5eeb64452ac93587e18666ec
author Steven Moreland <smoreland@google.com> 1500431159 +0000
committer android-build-merger <android-build-merger@google.com> 1500431159 +0000

Merge "external/neven: use proper nativehelper headers" am: 7a1bb8b2c5 am: f03656c663
am: 1b6a90285a

Change-Id: I5c2dd4a7dbab51bd373ddda66d92386b157f1232