收藏准备开发
Merge branch 'master' of https://github.com/ChinaWuxiandroid/chianwuxi_android
no update
noupdate
no update
no update
Merge branch 'master' of https://github.com/ChinaWuxiandroid/chianwuxi_android

Conflicts:
	chinaw/bin/chinaw.apk
	chinaw/bin/classes.dex
	chinaw/bin/classes/com/wuxi/app/activity/homepage/more/MenuItemSetActivity$MenuSetAdapter.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/more/MenuItemSetActivity.class
	chinaw/bin/classes/com/wuxi/app/engine/InterViewService.class
	chinaw/bin/classes/com/wuxi/app/engine/MenuService.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345ComplaintListFragment$1.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345ComplaintListFragment$2.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345ComplaintListFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345HotMail$2.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345MayorMailListFragment$1.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345MayorMailListFragment$2.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345MayorMailListFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIPContentFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIPSuggestPeopleWill.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIPSuggestPeopleWillFragment$2.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GoverInterPeople12345Fragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GoverInterPeopleSuggestFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/PartLeaderMailListFragment$1.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/PartLeaderMailListFragment$2.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/PartLeaderMailListFragment.class
	chinaw/bin/classes/com/wuxi/app/listeners/GoverInterPeopleInitLayoutImpl.class
	chinaw/bin/classes/com/wuxi/app/util/Constants$APPFiles.class
	chinaw/bin/classes/com/wuxi/app/util/Constants$CacheKey.class
	chinaw/bin/classes/com/wuxi/app/util/Constants$CheckPositionKey.class
	chinaw/bin/classes/com/wuxi/app/util/Constants$ExceptionMessage.class
	chinaw/bin/classes/com/wuxi/app/util/Constants$SharepreferenceKey.class
	chinaw/bin/classes/com/wuxi/app/util/Constants$Urls.class
	chinaw/bin/resources.ap_
收藏开发
Merge branch 'master' of https://github.com/ChinaWuxiandroid/chianwuxi_android

Conflicts:
	chinaw/bin/chinaw.apk
	chinaw/bin/classes.dex
	chinaw/bin/resources.ap_