修改FTP
未修改。可能是编码刷新过。
Merge branch 'master' of https://github.com/yangfan-njx/hwautotest.git

Conflicts:
	src/com/test/hwautotest/reboot/RebootActivity.java
	src/com/test/hwautotest/updateOnline/updateOnline.java