test2
Merge branch 'master' of https://github.com/masanorisone/testrep.git

Conflicts:
	Test1/src/com/example/test1/TestActivity.java