login
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/R.txt
	bin/classes.dex
	gen/com/crazyfish/demo/R.java
	res/values/strings.xml
用户
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/R.txt
	bin/classes.dex
	gen/com/crazyfish/demo/R.java