diff options
| author | 2011-02-23 14:38:10 -0800 | |
|---|---|---|
| committer | 2011-02-23 14:38:10 -0800 | |
| commit | b0e5326d8cc661448a7ff611d02d439d4a328a3d (patch) | |
| tree | a8f71c309459fec8ca873a30eb2a8e5936af93fe | |
| parent | 63a4f9f5e66e5fa38ed798c8cbcc44f623e42ec0 (diff) | |
| parent | a46a5cba276ee269d227a5e4d69f3891c4349edf (diff) | |
am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
DO NOT MERGE No backup of country and sleep policy
| -rw-r--r-- | core/java/android/provider/Settings.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 257f275b2c1e..1718189d8065 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1797,7 +1797,6 @@ public final class Settings { */ public static final String[] SETTINGS_TO_BACKUP = { STAY_ON_WHILE_PLUGGED_IN, - WIFI_SLEEP_POLICY, WIFI_USE_STATIC_IP, WIFI_STATIC_IP, WIFI_STATIC_GATEWAY, @@ -3704,7 +3703,6 @@ public final class Settings { TTS_ENABLED_PLUGINS, WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY, - WIFI_COUNTRY_CODE, WIFI_NUM_OPEN_NETWORKS_KEPT, MOUNT_PLAY_NOTIFICATION_SND, MOUNT_UMS_AUTOSTART, |