ignore .idea
Merge branch 'product'
Connect to conn server with non-block
clean import.R in same files
return to the privious demo
deleted android-support-v7
update changelog
resolve merging
1. Disable Nagle algorithm
2. Correct parameter error when getting SO_ERROR
wangfeng : mytcp.cpp
update jni for Disable nagle algorithm
dns timeout 3s
hide set tag/alias inbackground
set the dns timeout value
updage changelog