图集图标
提交调节字体activity
Merge branch 'master' of github.com:Zhishine/clientmeinvqiushi

Conflicts:
	qiushi/res/values/strings.xml
	qiushi/src/com/news/qiushi/MainActivity.java
Merge branch 'master' of github.com:Zhishine/clientmeinvqiushi