Update timer
I think now we get rid of math in the AlarmAlertActivity now. Need a new
layout for this activity.
Merge remote-tracking branch 'origin/TU-JIAYANG'
More Changes and why can't I push the last time?
Merge branch 'master' of https://github.com/thomasleung/shakalarm.git
comment out some useless import