Revert "Fixup"

This reverts commit d6e0b67ff53cc2a262969d089a5641b80e8bb151.
Revert "Fix issue 52986: Wifi settings abnormal when screen rotation"

This reverts commit d9bd9559ca53300dcf496d54280fbfe23d667ef7.
Revert "Add a quick SELinux mode toggle"

This reverts commit 470e2c2c0c77211f386fc0f02de347992876a299.
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	Android.mk
	AndroidManifest.xml
	proguard.flags
	res/layout/preference_dialog_brightness.xml
	res/values-de/arrays.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fi/arrays.xml
	res/values-fi/strings.xml
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-pl/strings.xml
	res/values-ru/strings.xml
	res/values-sv/strings.xml
	res/values/colors.xml
	res/values/strings.xml
	res/xml/development_prefs.xml
	res/xml/wifi_advanced_settings.xml
	src/com/android/settings/AccessibilitySettings.java
	src/com/android/settings/ApnEditor.java
	src/com/android/settings/ApnSettings.java
	src/com/android/settings/BrightnessPreference.java
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/RingerVolumePreference.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/SoundSettings.java
	src/com/android/settings/deviceinfo/Memory.java
	src/com/android/settings/deviceinfo/MiscFilesHandler.java
	src/com/android/settings/deviceinfo/UsbSettings.java
	src/com/android/settings/nfc/AndroidBeam.java
	src/com/android/settings/wfd/WifiDisplaySettings.java
	src/com/android/settings/wifi/AccessPoint.java

Change-Id: I058b08cea4595551bfb37a8ba40d2c2278497846

Conflicts:
	Android.mk
	res/values-af/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/arrays.xml
	res/values-de/strings.xml
	res/values-el/arrays.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hu/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt/arrays.xml
	res/values-pt/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-uk/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/arrays.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DateTimeSettings.java
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/SettingsPreferenceFragment.java
	src/com/android/settings/applications/InstalledAppDetails.java
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Revert "Settings: External GPS Support (1/2)"

This reverts commit a51b6fe70f5c989b9d11b062c62242784ac471bd.

Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	res/values/arrays.xml
	res/values/config.xml
	res/values/strings.xml

Change-Id: I220ebfd6de148e7dcdc7a0461a9ef4fd35acca95
aapt fixes
Signed-off-by: scotthartbti <scott@ubuntu.com>

Change-Id: I97a5433d9464c24578fb2d953f0c05b1306af3f8
CellBroadcast: Disable App links on wifi-only devices

PatchSet 2: Remove unnecessary check

Change-Id: I359b5fef2932dfa072b72384edf9ba730a1f71a1
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Fix app selection when adding apps to app groups.

- Don't drop separate apps with the same title
- Sort case-insensitive
- Sort disabled apps to the end of the list

Change-Id: Iffadca4896468aaee5fcfd60f8776c2bb1a8ce7f
Reenable split action bar for profile settings.

Change-Id: I5af3f0fd7cafaab6f2d9152df943658170fc58ce
Sort disabled apps to the end of the list in privacy guard manager.

JIRA: CYAN-1707
Change-Id: Ie3c1cf0339d66405d27c06dba07cc80e4001d669
Settings: Generic Blacklist support (1 of 5)

Change-Id: I58aff50637b9bf71095ec791e16efd520e6c29a3
Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	src/com/android/settings/SecuritySettings.java
Fix: Don't display the lock clock preference if its not installed

Removed duplicated codes

Change-Id: Ib7d54dfc33c6a66711799bbdf44212d287221ae9
Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
	src/com/android/settings/cyanogenmod/SystemSettings.java
Also remove preferences if app is installed, but disabled.

Change-Id: I7f23e7a05c336bd16cda3426c7b31922cb92e1b2
JIRA:CYAN-1861
Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	src/com/android/settings/SettingsPreferenceFragment.java
Improve translatability of summaries.

Change-Id: I362b335cbe219d6e371a458c9d50fcd66bdf19fe
Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	res/values/cm_strings.xml
disable not supported features on third party ime keyboards 2/2
Signed-off-by: scotthartbti <scott@ubuntu.com>

Change-Id: I1d0f81f7f05519e5e0fd4981ff9cdd6c2ee8d86b
Remove alt signals.
Signed-off-by: scotthartbti <scott@ubuntu.com>

Change-Id: Ia25d36f5d52055070b6652255dca0e19d608a845
Add a quick SELinux mode toggle

There's no way to make it persistent, by design. This is purposefully
undocumented and meant to test policies at this stage.

Change-Id: Ic79ed773b199b68fee15f94acd2107a5ad20dc25
Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java
Fix ups from 4.3 merge
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I63d2737222696652ae3bf3bc50be7011735f3048
Fix up lock screen force close
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: If85612501559f34f4fc70f7d68e9af4ea14355bb
fix scrolling with Chrome browser and other related browsers.

Change-Id: I1807c589e7727ce7ac5e97590cfa0ecb670d6494