commit e2322bdd7865552aa31f93bbf4e60d4d9a7d0973
author Robert Greenwalt <rgreenwalt@google.com> Tue May 07 20:45:03 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 07 20:45:03 2013 +0000
tree 6406e51111ee08a01296cf545422592c9b33ef8c
parent 84ce55cfd50bdfc7054de5ee9f69de7cf08b61ae
parent ffff923c748d3c2f9a907fb6b519de526a5cc267

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

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 4de5933..c16b2cc 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -5473,7 +5473,6 @@
             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,