changed by k242hd
Merge remote-tracking branch 'origin/muratomo' into k242hd

Conflicts:
	res/values/strings.xml
Merge remote-tracking branch 'origin/k242hd' into muratomo
activity_mainをちょっと弄ったよ