Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

java/jni/Android.mk

@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := ZeroTierOneJNI
 LOCAL_C_INCLUDES := $(ZT1)/include
 LOCAL_C_INCLUDES += $(ZT1)/node
-LOCAL_LDLIBS := -llog
+LOCAL_LDLIBS := -llog -latomic
 # LOCAL_CFLAGS := -g
 
 # ZeroTierOne SDK source files