zxn
zxn
zxn
Merge branch 'master' of github.com:lifang/homework_app

Conflicts:
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/comdosoft/homework/Class_xinxiliu$1.class
	bin/classes/com/comdosoft/homework/Class_xinxiliu$2.class
	bin/classes/com/comdosoft/homework/Class_xinxiliu$MicropostAdapter$1.class
	bin/classes/com/comdosoft/homework/Class_xinxiliu$MicropostAdapter$2.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$1.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$2.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$Adapter$1.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$Adapter.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$MicropostAdapter$1.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$MicropostAdapter$2.class
	bin/classes/com/comdosoft/homework/Classxinxiliu$MicropostAdapter.class
	bin/classes/com/comdosoft/homework/Classxinxiliu.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity$1.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity$2.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity$3.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity$MyQuestionAdapter.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity$MyWorkDateAdapter.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity$getClassInfo.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity.class
	bin/classes/com/comdosoft/homework/R$layout.class
	bin/classes/com/comdosoft/homework/RegistrationActivity.class
	bin/classes/com/comdosoft/homework/SettingActivity.class
	bin/classes/com/comdosoft/homework/SpeakBeginActivity$1.class
	bin/classes/com/comdosoft/homework/SpeakBeginActivity.class
	bin/classes/com/comdosoft/homework/SpeakPrepareActivity.class
	bin/classes/com/comdosoft/homework/class_xinxiliu.class
	bin/classes/com/comdosoft/homework/tools/HomeWorkTool.class
	bin/homework_app.apk
	bin/resources.ap_
	src/com/comdosoft/homework/HomeWorkIngActivity.java