modified:   smile_android/gen/com/holding/smile/R.java
	modified:   smile_android/res/layout/goods_detail_view.xml
	new file:   smile_android/res/layout/pager_pic_item.xml
	modified:   smile_android/src/com/holding/smile/activity/GoodsDetailActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   res/layout/pager_pic_item.xml
	modified:   src/com/holding/smile/activity/BaseActivity.java
	modified:   src/com/holding/smile/adapter/MyShoppingCartAdapter.java