tree 860bf7d248a0b4c9793e90a946836d3715b0aec6
parent 95e6c4663c640c67a69e1d2b44696753282136f8
parent 514be1cd565e0b706726ffc67cfdee307e0f3af2
author Steven Moreland <smoreland@google.com> 1500431308 +0000
committer android-build-merger <android-build-merger@google.com> 1500431308 +0000

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

Change-Id: I517e7754f6bf76c8e7c84066d945a747c2c9f6c2