restore the progress
git commit res/values/strings.xml
Merge branch 'master' of https://github.com/shenyichong/Alarmclock
Merge branch 'newTimePicker2' of https://github.com/shenyichong/Alarmclock
git commit .