trying to fix JIT

Change-Id: I90eef95f88f6afc5cc6365a07d3cbdfb268912a8
Revert "trying to fix JIT"

This reverts commit b02f71331e302c7e30dc742e80292cc6fa9f99fb.
propmodder: fix jit option

Change-Id: Idfec787c9f206768a3352e21dd4a001e5b242567
Revert "Halo: Add master switch to disable Halo (2/2)"

This reverts commit fa70ec7e6aaccd3dd22d202ba47a21f8de2d0cbc.
Revert "Halo visibility when there are no notifications option"

This reverts commit a41b8b78865d0cda4ea2c3741a8ecdc2162c6718.

Conflicts:
	res/values/cm_strings.xml

Change-Id: I11141df630348135967e93834c497e0993f26879
Revert "Halo settings matching frameworks changes"

This reverts commit 4a0fc0dd942dafcc23cee5d4b34e10fc8e4eca53.
Revert "Some Halo color options"

This reverts commit 2aba36e9f76d1df9ebd84b78518dc450ce9da10f.
Revert "move halo to own submenu"

This reverts commit b1f7df383bc1636e040f9b10cb8866597222bdc4.

Conflicts:
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java

Change-Id: Ib97eaaa92dbf8128563fa7f8633e6aa80d5ea114
Revert "Halo: Add master switch to disable Halo (2/2)"

This reverts commit 6d47728055f09ebcd878b1bedac0ff5874bcb22d.

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

Change-Id: If617710f797400769b5a416e66c17743172420cf
Revert "Floating window (2/2)"

This reverts commit d8bcc26771f568fcfdd4a2d7b45cbf5d5403abe2.

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

Change-Id: I3860461aa39ac24b0eddc06e52ab220b389fa346
Revert "HALO (2/2)"

This reverts commit 98ecad8fae79dd937f9b4e01e149d2470e1fba7a.

Conflicts:
	res/layout/installed_app_details.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	src/com/android/settings/applications/InstalledAppDetails.java
	src/com/android/settings/cyanogenmod/SystemSettings.java

Change-Id: If8000cefb96b3dbb2d1406a0cd6b46a96d36baaa
fix

Change-Id: Ib0c8be1492421635a215d94b9b425583f6c8f618
Initial import of HALO from ParanoidAndroid 4.3

Change-Id: Ifa5db2e486fae4430d80f769dacace2fe501561a

Conflicts:
	res/layout/installed_app_details.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/applications/InstalledAppDetails.java
Add option to remove halo button from the notification drawer

Change-Id: I08dd4f2617f0535e4c7cd5c246d11ed115525a58
Merge branch 'Upstream/cm-10.2'