添加课程管理
添加课程管理
添加课程管理
Merge branch 'ringer_develop'

Conflicts:
	bin/R.txt
	bin/ZhangShangWuDa.apk
	bin/classes.dex
	bin/classes/zq/whu/zhangshangwuda/adapter/NewsListViewAdapter.class
	bin/classes/zq/whu/zhangshangwuda/ui/R$id.class
	bin/classes/zq/whu/zhangshangwuda/ui/R$integer.class
	bin/classes/zq/whu/zhangshangwuda/ui/R$layout.class
	bin/classes/zq/whu/zhangshangwuda/ui/R$string.class
	bin/classes/zq/whu/zhangshangwuda/ui/R$style.class
	bin/classes/zq/whu/zhangshangwuda/ui/R$styleable.class
	bin/classes/zq/whu/zhangshangwuda/ui/R$xml.class
	bin/classes/zq/whu/zhangshangwuda/ui/ringer/RingerFragmentSupport.class
	bin/classes/zq/whu/zhangshangwuda/ui/wifi/CreateOneKeyWifi.class
	bin/classes/zq/whu/zhangshangwuda/ui/wifi/OneKeyWifi.class
	bin/classes/zq/whu/zhangshangwuda/ui/wifi/WifiFragmentSupport.class
	bin/dexedLibs/actionbarsherlock-79db1756819fa99028aa495fab3671b9.jar
	bin/dexedLibs/menudrawer-1689f7c9916bff7ebd2ae0e65d319e57.jar
	bin/dexedLibs/viewpagerindicator-4e7bb1d025c784bf4ad52bfa62b1c586.jar
	bin/resources.ap_
	gen/zq/whu/zhangshangwuda/ui/R.java
	library/actionbarsherlock/bin/actionbarsherlock.jar
	library/menudrawer/bin/menudrawer.jar
	library/viewpagerindicator/bin/viewpagerindicator.jar