git.osdn.net Git - android-x86/packages-apps-Settings.git/commit

Merge commit '819bbf1e649c2dfe823275cf531c5b4e5aa7cb26' 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

author	Lalit Kansara <lkansara@codeaurora.org>
	Tue, 6 Dec 2016 09:28:57 +0000 (14:58 +0530)
committer	Lalit Kansara <lkansara@codeaurora.org>
	Tue, 6 Dec 2016 09:28:57 +0000 (14:58 +0530)
commit	f15c62d6c3ce178333c56b47740673fd86af6182
tree	6e52846ab09120b096f423be51a637f38f247e3a	tree \| snapshot
parent	86f1cc1bd28800a589cb2642eb082a8ab4683530	commit \| diff
parent	819bbf1e649c2dfe823275cf531c5b4e5aa7cb26	commit \| diff

Android.mk	diff1 \|	diff2 \|	blob \| history
AndroidManifest.xml	diff1 \|	diff2 \|	blob \| history
res/layout/wifi_dialog.xml	diff1 \|	diff2 \|	blob \| history
res/menu/storage_volume.xml	diff1 \|	diff2 \|	blob \| history
res/values-am/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ar/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-az-rAZ/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-bg/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-bn-rBD/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ca/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-cs/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-da/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-de/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-el/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-es-rUS/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-es/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-et-rEE/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-eu-rES/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-fa/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-fi/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-fr-rCA/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-fr/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-gl-rES/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-hi/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-hr/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-hu/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-hy-rAM/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-in/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-is-rIS/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-it/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ja/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ka-rGE/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-kk-rKZ/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-km-rKH/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-kn-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ko/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-lt/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-lv/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-mk-rMK/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ml-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-mr-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ms-rMY/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ne-rNP/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-nl/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-pl/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-pt-rPT/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-pt/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ro/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ru/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-si-rLK/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-sk/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-sl/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-sr/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-sv/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-sw/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-ta-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-te-rIN/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-th/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-tr/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-uk/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-uz-rUZ/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-vi/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-zh-rCN/arrays.xml	diff1 \|	diff2 \|	blob \| history
res/values-zh-rCN/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-zh-rHK/arrays.xml	diff1 \|	diff2 \|	blob \| history
res/values-zh-rHK/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values-zh-rTW/arrays.xml	diff1 \|	diff2 \|	blob \| history
res/values-zh-rTW/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values/arrays.xml	diff1 \|	diff2 \|	blob \| history
res/values/bools.xml	diff1 \|	diff2 \|	blob \| history
res/values/config.xml	diff1 \|	diff2 \|	blob \| history
res/values/dimens.xml	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	diff1 \|	diff2 \|	blob \| history
res/xml/billing_cycle.xml	diff1 \|	diff2 \|	blob \| history
res/xml/device_info_settings.xml	diff1 \|	diff2 \|	blob \| history
res/xml/display_settings.xml	diff1 \|	diff2 \|	blob \| history
res/xml/privacy_settings.xml	diff1 \|	diff2 \|	blob \| history
res/xml/wifi_configure_settings.xml	diff1 \|	diff2 \|	blob \| history
res/xml/wireless_settings.xml	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/ApnEditor.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/AppListPreference.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/ChooseLockGeneric.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/ConfirmLockPattern.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/DateTimeSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/DeviceInfoSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/DisplaySettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/PrivacySettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/Settings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/SettingsActivity.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/SettingsPreferenceFragment.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/TetherSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/Utils.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/WifiCallingSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/WirelessSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/accounts/AccountPreferenceBase.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/accounts/AccountSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/applications/AppStorageSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/applications/ManageApplications.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/bluetooth/BluetoothPairingDialog.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/bluetooth/BluetoothSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/bluetooth/DeviceProfilesSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/dashboard/DashboardAdapter.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/dashboard/DashboardSummary.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/datausage/AppDataUsage.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/datausage/BillingCycleSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/datausage/DataUsageSummary.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/deviceinfo/ImeiInformation.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/deviceinfo/SimStatus.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/deviceinfo/StorageSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/notification/SoundSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/wifi/ConfigureWifiSettings.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/wifi/WifiConfigController.java	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/wifi/WifiSettings.java	diff1 \|	diff2 \|	blob \| history