Merge commit '819bbf1e' into remote

Conflicts:
	Android.mk
	AndroidManifest.xml
	res/menu/storage_volume.xml
	res/values-am/strings.xml
	res/values-az-rAZ/strings.xml
	res/values-bn-rBD/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-es-rUS/strings.xml
	res/values-et-rEE/strings.xml
	res/values-eu-rES/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr-rCA/strings.xml
	res/values-fr/strings.xml
	res/values-gl-rES/strings.xml
	res/values-hi/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-hy-rAM/strings.xml
	res/values-in/strings.xml
	res/values-is-rIS/strings.xml
	res/values-it/strings.xml
	res/values-ja/strings.xml
	res/values-ka-rGE/strings.xml
	res/values-kk-rKZ/strings.xml
	res/values-km-rKH/strings.xml
	res/values-kn-rIN/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-mk-rMK/strings.xml
	res/values-ml-rIN/strings.xml
	res/values-mr-rIN/strings.xml
	res/values-ms-rMY/strings.xml
	res/values-ne-rNP/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-si-rLK/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-ta-rIN/strings.xml
	res/values-te-rIN/strings.xml
	res/values-th/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-uz-rUZ/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rHK/strings.xml
	res/values-zh-rTW/strings.xml
	res/values/arrays.xml
	res/values/bools.xml
	res/values/config.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/display_settings.xml
	res/xml/wireless_settings.xml
	src/com/android/settings/ApnEditor.java
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/PrivacySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/SettingsActivity.java
	src/com/android/settings/Utils.java
	src/com/android/settings/WifiCallingSettings.java
	src/com/android/settings/WirelessSettings.java
	src/com/android/settings/dashboard/DashboardAdapter.java
	src/com/android/settings/dashboard/DashboardSummary.java
	src/com/android/settings/datausage/BillingCycleSettings.java
	src/com/android/settings/datausage/CellDataPreference.java
	src/com/android/settings/deviceinfo/ImeiInformation.java
	src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
	src/com/android/settings/deviceinfo/SimStatus.java
	src/com/android/settings/deviceinfo/StorageSettings.java
	src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
	src/com/android/settings/wifi/ConfigureWifiSettings.java
	src/com/android/settings/wifi/WifiApEnabler.java
	src/com/android/settings/wifi/WifiSettings.java

Change-Id: I5df683ae8c5f810bff5679dc310c6d79ba26a24f