lj
ljMerge github.com:suntinghui/POS2Android_YLT

Conflicts:
	src/com/dhc/pos/activity/ASBalancePwdActivity.java
	src/com/dhc/pos/util/ByteUtil.java
	src/com/dhc/pos/util/UnionDes.java
lj
lj