修改
Merge branch 'master' of git@github.com:suntinghui/POS2Android_Standard.git
Merge branch 'master' of git@github.com:suntinghui/POS2Android_Standard.git
ll
Merge branch 'master' of git@github.com:suntinghui/POS2Android_Standard.git

Conflicts:
	src/com/dhc/pos/agent/client/TransferPacketThread.java