modified:   gen/com/holding/smile/R.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   AndroidManifest.xml
	modified:   src/com/holding/smile/activity/OrderPayActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz