提交日计划，未完成
Merge branch 'master' of github.com:chen4342024/Plan

Conflicts:
	src/com/cc/activity/TestActivity.java
提交测试代码
Merge branch 'master' of github.com:chen4342024/Plan

Conflicts:
	res/layout/activity_test.xml
	src/com/cc/activity/TestActivity.java
Merge branch 'master' of github.com:chen4342024/Plan
test
Merge branch 'master' of github.com:chen4342024/Plan

Conflicts:
	res/layout/activity_test.xml
资源
Merge branch 'master' of github.com:chen4342024/Plan

Conflicts:
	src/com/cc/activity/TestActivity.java
TEST