第6次提交
第7次提交
Merge branch 'master' of https://github.com/yangfannjx/hellojava.git

Conflicts:
	src/com/example/hellojava/MainActivity.java