Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

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
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2

Conflicts:
	Android.mk

Change-Id: I407d1ead2e98bbb2103ed7c601800162075da90a