test

Signed-off-by: msakauye <msakauye@gmail.com>
edit!

Signed-off-by: msakauye <msakauye@gmail.com>
edit #2
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestProject/src/MainActivity.java