てすと
ああ
CCC
Merge branch 'master' of https://github.com/naodroid/android-test

Conflicts:
	android-test/test.txt