git commit res/values/strings.xml
Merge branch 'newTimePicker2' of https://github.com/shenyichong/Alarmclock into newTimePicker2

Conflicts:
	res/values/strings.xml

git commit .