QuietHours
	new file:   res/layout/preference_time_range.xml
	modified:   res/values/pa_arrays.xml
	modified:   res/values/pa_strings.xml
	new file:   res/xml/quiet_hours_settings.xml
	modified:   res/xml/sound_settings.xml
	modified:   src/com/android/settings/Settings.java
	modified:   src/com/android/settings/SoundSettings.java
	new file:   src/com/android/settings/cyanogenmod/QuietHours.java
	new file:   src/com/android/settings/cyanogenmod/TimeRangePreference.java
Settings: Blacklist support

	modified:   AndroidManifest.xml
	new file:   res/drawable-hdpi/ic_blacklist_calls_off.png
	new file:   res/drawable-hdpi/ic_blacklist_calls_on.png
	new file:   res/drawable-hdpi/ic_blacklist_messages_off.png
	new file:   res/drawable-hdpi/ic_blacklist_messages_on.png
	new file:   res/drawable-hdpi/ic_see_contacts_holo_dark.png
	new file:   res/drawable-mdpi/ic_blacklist_calls_off.png
	new file:   res/drawable-mdpi/ic_blacklist_calls_on.png
	new file:   res/drawable-mdpi/ic_blacklist_messages_off.png
	new file:   res/drawable-mdpi/ic_blacklist_messages_on.png
	new file:   res/drawable-mdpi/ic_see_contacts_holo_dark.png
	new file:   res/drawable-xhdpi/ic_blacklist_calls_off.png
	new file:   res/drawable-xhdpi/ic_blacklist_calls_on.png
	new file:   res/drawable-xhdpi/ic_blacklist_messages_off.png
	new file:   res/drawable-xhdpi/ic_blacklist_messages_on.png
	new file:   res/drawable-xhdpi/ic_see_contacts_holo_dark.png
	new file:   res/drawable-xxhdpi/ic_blacklist_calls_off.png
	new file:   res/drawable-xxhdpi/ic_blacklist_calls_on.png
	new file:   res/drawable-xxhdpi/ic_blacklist_messages_off.png
	new file:   res/drawable-xxhdpi/ic_blacklist_messages_on.png
	new file:   res/drawable/ic_blacklist_calls.xml
	new file:   res/drawable/ic_blacklist_messages.xml
	new file:   res/layout/blacklist_entry_row.xml
	new file:   res/layout/dialog_blacklist_edit_entry.xml
	new file:   res/menu/blacklist.xml
	new file:   res/values/custom_arrays.xml
	new file:   res/values/custom_strings.xml
	new file:   res/xml/blacklist_prefs.xml
	modified:   res/xml/security_settings_biometric_weak.xml
	modified:   res/xml/security_settings_chooser.xml
	modified:   res/xml/security_settings_password.xml
	modified:   res/xml/security_settings_pattern.xml
	modified:   res/xml/security_settings_pin.xml
	deleted:    src/com/android/settings/DisplaySettings.java~
	modified:   src/com/android/settings/SecuritySettings.java
	modified:   src/com/android/settings/Settings.java
	modified:   src/com/android/settings/SubSettings.java
	new file:   src/com/android/settings/blacklist/BlacklistSettings.java
	new file:   src/com/android/settings/blacklist/EntryEditDialogFragment.java
	new file:   src/com/android/settings/blacklist/PreferenceFragment.java
	new file:   src/com/android/settings/blacklist/ToggleImageView.java