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
123456
no
123
111
t
no
15
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	bin/R.txt
	bin/classes.dex
	bin/classes/com/crazyfish/activity/LoginActivity$1.class
	bin/classes/com/crazyfish/activity/LoginActivity.class
	bin/classes/com/crazyfish/activity/PostActivity$1.class
	bin/classes/com/crazyfish/activity/PostActivity.class
	bin/classes/com/crazyfish/activity/fragment/HomeFragment$1$1.class
	bin/classes/com/crazyfish/activity/fragment/HomeFragment$1.class
	bin/classes/com/crazyfish/activity/fragment/HomeFragment.class
	bin/classes/com/crazyfish/activity/fragment/MeFragment$1.class
	bin/classes/com/crazyfish/activity/fragment/MeFragment.class
	bin/classes/com/crazyfish/activity/fragment/TakePhotoFragment$1.class
	bin/classes/com/crazyfish/activity/fragment/TakePhotoFragment$2.class
	bin/classes/com/crazyfish/activity/fragment/TakePhotoFragment.class
	bin/classes/com/crazyfish/demo/R$id.class
	bin/classes/com/crazyfish/demo/R$integer.class
	bin/classes/com/crazyfish/demo/R$layout.class
	bin/classes/com/crazyfish/demo/R$menu.class
	bin/classes/com/crazyfish/demo/R$string.class
	bin/classes/com/crazyfish/demo/R$style.class
	bin/classes/com/crazyfish/demo/R$styleable.class
	bin/classes/com/crazyfish/util/GlobalVariable.class
	bin/demo.apk
	bin/resources.ap_
	gen/com/crazyfish/demo/R.java
	src/com/crazyfish/activity/PostActivity.java
	src/com/crazyfish/activity/fragment/MeFragment.java
	src/com/crazyfish/activity/fragment/TakePhotoFragment.java
	src/com/crazyfish/util/GlobalVariable.java