first commit to local
Merge branch 'xiaofanzhuo-master' of
https://github.com/xiaolonginfo/xiaofanzhuo-android.git into
xiaofanzhuo-master

Conflicts:
	bin/Qihoo-xiaofanzhuo_version.apk
	bin/R.txt
	bin/classes.dex
	bin/resources.ap_
2014-05-25 15:05 by liupeng
ListView 修复 Bug。
Merge pull request #1 from gcliupeng/xiaofanzhuo-master

xiaofanzhuo-05-25