테스트 3
Rebase 테스트 1
Merge remote-tracking branch 'origin/test' into sirin2c

Conflicts:
	res/values/strings.xml