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

Conflicts:
	bin/classes.dex
	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/DictationBeginActivity.class
	bin/classes/com/comdosoft/homework/DictationPrepareActivity$MyThread.class
	bin/classes/com/comdosoft/homework/DictationPrepareActivity.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$getQuestion.class
	bin/classes/com/comdosoft/homework/HomeWorkIngActivity.class
	bin/classes/com/comdosoft/homework/HomeWorkMainActivity$1.class
	bin/classes/com/comdosoft/homework/HomeWorkMainActivity.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$2.class
	bin/classes/com/comdosoft/homework/SpeakBeginActivity$3.class
	bin/classes/com/comdosoft/homework/SpeakBeginActivity$4.class
	bin/classes/com/comdosoft/homework/SpeakBeginActivity$Record_answer_info.class
	bin/classes/com/comdosoft/homework/SpeakBeginActivity$SendWorkOver.class
	bin/classes/com/comdosoft/homework/SpeakBeginActivity.class
	bin/classes/com/comdosoft/homework/SpeakHistoryActivity$1.class
	bin/classes/com/comdosoft/homework/SpeakHistoryActivity$2.class
	bin/classes/com/comdosoft/homework/SpeakHistoryActivity$3.class
	bin/classes/com/comdosoft/homework/SpeakHistoryActivity.class
	bin/classes/com/comdosoft/homework/SpeakPrepareActivity$1.class
	bin/classes/com/comdosoft/homework/SpeakPrepareActivity$2.class
	bin/classes/com/comdosoft/homework/SpeakPrepareActivity$3.class
	bin/classes/com/comdosoft/homework/SpeakPrepareActivity.class
	bin/classes/com/comdosoft/homework/adapter/Adapter.class
	bin/classes/com/comdosoft/homework/pull/XListView.class
	bin/classes/com/comdosoft/homework/pull/XListViewFooter.class
	bin/classes/com/comdosoft/homework/pull/XListViewHeader.class
	bin/classes/com/comdosoft/homework/tools/ListeningQuestionMap.class
	bin/classes/com/comdosoft/homework/tools/PredicateLayout.class
	bin/classes/com/comdosoft/homework/tools/RecordService.class
	bin/homework_app.apk