fix up bad merge

Change-Id: Ifd2b64021fee68bf21e459b115c74b87ccb88048
Signed-off-by: soup <soup@ubuntu>

Conflicts:
	src/com/android/settings/cyanogenmod/QuietHours.java