1.小修改
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
临时性提交