Merge branches 'android_TW' and 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
继续去除测试代码
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW