5
8/5 22:38Merge remote-tracking branch 'origin/pangrong' into hcjcch

Conflicts:
	AndroidManifest.xml
	src/cn/fanfan/detilques/Detilques.java