.
内网断开连接
Merge branch 'chenyan'

Conflicts:
	res/values/strings.xml
	src/com/chainton/pdmclient/ConnectDevicesActivity.java