summaryrefslogtreecommitdiff
path: root/app/jni
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-11-05 16:51:16 +0100
committerParménides GV <parmegv@sdf.org>2014-11-05 16:51:16 +0100
commit6544b8d32ccf81a6c1d832217642b873be8dc6b7 (patch)
treeb07723b530e20b23ae83de822387f6551ea7f9f4 /app/jni
parent713c3a98f53a6bd1ad94e90f28d3e37d20abfab9 (diff)
parent5304543ebd60778ad46123cd63142e27627fa150 (diff)
Merge branch 'bug/Android-5-Lollipop-VPN-fails-#6232' into develop
Diffstat (limited to 'app/jni')
-rw-r--r--app/jni/Application.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/jni/Application.mk b/app/jni/Application.mk
index b7af50cd..21718248 100644
--- a/app/jni/Application.mk
+++ b/app/jni/Application.mk
@@ -8,4 +8,4 @@ APP_STL:=stlport_shared
#LOCAL_ARM_MODE := arm
-#NDK_TOOLCHAIN_VERSION=clang
+#NDK_TOOLCHAIN_VERSION=clang \ No newline at end of file