am e2322bdd: Merge "Don\'t back up the scan-always setting." into jb-mr2-dev

* commit 'e2322bdd7865552aa31f93bbf4e60d4d9a7d0973': Don't back up the scan-always setting.
2013-05-07 13:48:49 -07:00
parent a14a14ab85 e2322bdd78
commit 27c8b559b6
1 changed files with 0 additions and 1 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -5473,7 +5473,6 @@ public final class Settings {
            WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
            WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY,
            WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
-            WIFI_SCAN_ALWAYS_AVAILABLE,
            WIFI_NUM_OPEN_NETWORKS_KEPT,
            EMERGENCY_TONE,
            CALL_AUTO_RETRY,