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

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

Change-Id: I5de81da4a4004b7e630f3e98578f5d1247688bed