Merge "Hide not disable, carrier logo" into kitkat
Settings: Show Heads Up on Bottom [2/2]

AICPfy

Change-Id: I4cb1d0aea1a8db755c1c3489c1b3ef7459585b96
Settings: Support showing carrier/provider logo on statusbar [2/2]

AICPfy

Change-Id: I91e9707f608c99b4c9c76e281caa294ca44c9bb8
MIUI and LOGO carrier default to OFF

fix logic

Change-Id: I8baad769caeb9d4ed50ca81e1e3ac61ab1bc39e8
Fix logic again

Change-Id: Ic8489019c5ba3aa0292e7d854de095403ca42ae7
Hide not disable, carrier logo

Change-Id: I7c3a08500825fb55f58d9be28dfa457f1d2c3853
Revert "Hide not disable, carrier logo"

This reverts commit 2fedb24292cbb4de2130fdc1431a10903d1eba7e.

Change-Id: Ie2df5b3d75637f45309174d79cfdad1d0afc4359
Merge "Revert "Hide not disable, carrier logo"" into kitkat
Revert "Fix logic again"

This reverts commit 2d9f27538a0d1ace233c8c5b64bec53d63c14d53.

Change-Id: I54173875c2e7ec1342488cb4cbfdffcd6dfe0cb0
Merge "Revert "Fix logic again"" into kitkat
Revert "MIUI and LOGO carrier default to OFF"

This reverts commit cb1ee8286811286a3d56996d017f1f1528a9f622.

Change-Id: I813d388b21f2ccaed4181c696ef4b72e93159fc8
Merge "Revert "MIUI and LOGO carrier default to OFF"" into kitkat
Revert "Settings: Support showing carrier/provider logo on statusbar [2/2]"

This reverts commit 7f64409a47c62787d39488acbeb08fad3c74253d.

Change-Id: Ia071cadfb77f8a9fdfcc2ee68a7b7f634ebc06d2
Merge "Revert "Settings: Support showing carrier/provider logo on statusbar [2/2]"" into kitkat
Rework some Settings
Merge remote-tracking branch 'ap/kitkat' into kitkat

Conflicts:
	res/values/strings_aicp.xml
	res/xml/aicp_carrier_label_prefs.xml
	src/com/android/settings/aicp/CarrierLabel.java
	src/com/android/settings/aicp/HeadsUpSettings.java
Fix Merge
Rework Some Settings/Move 6bar to statusbar
Merge remote-tracking branch 'ap/kitkat' into kitkat

Conflicts:
	res/values/strings_aicp.xml
	res/xml/aicp_carrier_label_prefs.xml
fix merge