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

Conflicts:
	Android.mk
	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-be/strings.xml
	res/values-bg/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-et/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hi/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-in/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-ms/strings.xml
	res/values-nb/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/development_prefs.xml
	res/xml/display_settings.xml
	src/com/android/settings/BrightnessPreference.java
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/applications/InstalledAppDetails.java