345678
Merge branch 'master' of https://github.com/NashLegend/CustomAlarm

Conflicts:
	gen/com/example/customalarm/R.java