Merge branch 'cm-10.1' of https://github.com/PAC-man/android_packages_apps_Settings into cm-10.1

Conflicts:
	AndroidManifest.xml
	proguard.flags
	res/drawable-nodpi/paclogo.png
	res/layout/logo_row.xml
	res/layout/manage_applications_item.xml
	res/layout/preference_memoryusage.xml
	res/values-es/strings.xml
	res/values/arrays.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/strings.xml
	res/xml/device_info_settings.xml
	res/xml/halo_settings.xml
	res/xml/security_settings_app_cyanogenmod.xml
	res/xml/settings_headers.xml
	res/xml/sound_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/SoundSettings.java
	src/com/android/settings/applications/InstalledAppDetails.java
	src/com/android/settings/cyanogenmod/QuickSettings.java
	src/com/android/settings/cyanogenmod/QuickSettingsUtil.java
	src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
	src/com/android/settings/deviceinfo/UsageBarPreference.java
	src/com/android/settings/inputmethod/StylusGestures.java
	src/com/android/settings/pac/PACLogoActivity.java
	src/com/android/settings/paranoid/Halo.java
	src/com/android/settings/profiles/ProfileConfig.java
	src/com/android/settings/profiles/ProfileConnectionPreference.java