beiminglei_one
梅子，我来了
FeatureA
Merge branch 'develop' of https://github.com/tadeshan/Android-fans into develop
FeatureA
ignore failure
 message for your changes. Lines starting
dljfklsdjfk

with '#' will be ignored, and an empty message aborts the commit.
ignore test
sha?
test ignore
all
Merge branch 'develop' of https://github.com/tadeshan/Android-fans into develop

Conflicts:
	bin/classes/com/android_fans/test/MainActivity.class
	bin/classes/com/android_fans/test/R$layout.class
	bin/classes/com/android_fans/test/R$menu.class
	bin/classes/com/android_fans/test/R$string.class
	bin/classes/com/android_fans/test/R$style.class
	gen/com/android_fans/test/R.java
addview
bug fix