fix quiet hours
	modified:   AndroidManifest.xml

Change-Id: I69257dc2ffe0751fe1230fcc9cabfb2d7480d959
Settings: Make sure time-range summaries match

If time-range is set back to s == e make sure we set summaries
	for both respectively.

Change-Id: I74cf11896920ab88e34920bae45bb341f4d1cc1c
Merge "Revert "Configurable init.d"" into kitkat3
Fix custom device display settings

*for bacon

Change-Id: Id1fa7da48d58924bb7a661dad2834ac98241b36e
Revert "Fix custom device display settings"

This reverts commit 66002f3df86342f5fed36f717c6177adccecc629.

Change-Id: I6fead4dc520516ca4961732b864462a9dbfafb6b
Switch name of reset option to generic

Going to be adding more on the spot's soon not just swipe left to float

Change-Id: I88a9540eefe767e691c3f45ef8ab5ae2f5180a41
Settings: Quiet Hours System Sounds (2/2)

Conflicts:
	res/values/slim_strings.xml

	modified:   res/values/liquid_strings.xml
	modified:   res/xml/quiet_hours_settings.xml
	modified:   src/com/android/settings/liquid/QuietHours.java
	modified:   src/com/android/settings/liquid/service/QuietHoursController.java
Change-Id: I91ec287ec7eb3b3cbe6249e03ae3d189e59e58e1
	modified:   res/values/liquid_strings.xml
	modified:   res/xml/quiet_hours_settings.xml
	modified:   src/com/android/settings/liquid/QuietHours.java
	modified:   src/com/android/settings/liquid/service/QuietHoursController.java
Revert "Configurable init.d"

This reverts commit e13efc278687ff637342d8296e8a720ddced7122.

Change-Id: I8ea22e3c84eb5888a797a3fc1318233b919e7c14
Revert "PropModder"

This reverts commit 3891e7d9dc5c740565a2cb127ef0b631952c53c3.

Change-Id: I25250c5b8e924aef56000474aa373e63d0893e31
Merge "Revert "PropModder"" into kitkat3
Settings: Add screen color settings

Add "Screen Color" item in settings.
This function support set Hue, Saturation, Contrast and Intensity value,
and screen color will be changed by this settings.

Change-Id: I481cbe0f6524fd0899dab60b81f0093a25ba64c4
QuickBoot: enable QuickBoot Settings UI

Add QuickBoot enable item in DevelopmentSettings.

Change-Id: I13d644358bf0f23eed356c25dffce9fbd1384dcc
Hover: exclude from lock screen (2/2)

Enable/disable hover notifications from lock screen

Change-Id: I011cfe31adae06e7ec43e08d9d8286cd9b554540
HOVER: touch to hide (2/2)

- Allow users to configure touching outside to instant hide HOVER notifications

Change-Id: I04cce2e5f2fe8b66e725471baf027f7ca9838468
Merge "HOVER: touch to hide (2/2)" into kitkat3
Disable settings search on all subactivities.

This leaves the search in place in multi-pane configurations, and keeps
it only in the main settings screen for single-pane configurations.

Conflicts:
	src/com/android/settings/Settings.java

Change-Id: I94d861453a1017731fbdc6d853e448e369358734
Merge "Disable settings search on all subactivities." into kitkat3
Settings: Don't show protected apps options in restricted profiles.

Change-Id: I38c2e8fd3508d360f0e23703ce6c939f02f3714e
JIRA: 4668
Issue: https://jira.cyanogenmod.org/browse/CYAN-4668
Merge "Settings: Don't show protected apps options in restricted profiles." into kitkat3
Revert "Settings: disable lock screen heads up (2/2)"

This reverts commit 4a778bb12227bfd61d7f59a4188f55e4797fa73e.

Change-Id: I97259baa56ec40875b008c8b31a362b73c5347ec