支付
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	XYComPayMiddleWare/AndroidManifest.xml
	XYComPayMiddleWare/src/com/xy/xypay/utils/DimensUtils.java
支付