[2/3]TeloRadio packages_apps_Settings
	* Lista de configuracion
		> Enable manager
		> Use LTE
		> 2G with Wi-Fi
		> 2G with screen off
		> 3G to unlock

Conflicts:
	AndroidManifest.xml
	res/values-es/tk_strings.xml
	res/values/tk_arrays.xml
	res/values/tk_strings.xml

Change-Id: Idcf405fa309d09be8fc546fddd715425711954f9

Conflicts:
	res/values-es/slim_strings.xml
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	res/xml/settings_headers.xml
option to enable network activity indicators in statusbar

Change-Id: Ifd4cee72219415a060324d5c0a97a87135cef6c4
option to enable double tap to sleep in statusbar

Change-Id: Ic1e31c7c646a4057e69ec2bf5c0111c2f31156ff
Add new themes items to personalization menu

Bring in logic for the new chooser. If TMO chooser is installed it will get
first priority.

Change-Id: Ia8e852e5e5ad2465d0b9b73f16c7080a7337bb8a

Conflicts:

	res/values/slim_strings.xml
	res/xml/settings_headers.xml

Conflicts:
	res/values-es/slim_strings.xml
	res/values/slim_strings.xml
	res/xml/settings_headers.xml
	res/xml/slim_interface_settings.xml
Add New Theme Chooser Icons
Add Entrypoint for theme sounds

Change-Id: I6da2fa782b9b88fc669144eb50c3231d031cd620
Settings: Add bridge to PerformanceControl

Conflicts:

	AndroidManifest.xml
	res/values/mahdi_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java

Change-Id: Ia1f5a4d6ec560bfa7f5dfee0acf5b2fd94282d4f

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/Settings.java
fix

Change-Id: I5e208dfa91a2bc6868909230baae02ee61a7c5df