test  commit to branch_1.0
branch_1.0 commit
Merge branch 'branch_1.0'

Conflicts:
	test_branch/bin/classes/com/example/test_branch/MainActivity.class
	test_branch/src/com/example/test_branch/MainActivity.java