summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-11-25 17:38:02 +0000
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2010-11-25 17:38:02 +0000
commit305bf62f59935f2743df497fb9524ac18b69fec5 (patch)
treef1ccc0303293e3dcedb1efb3f0b480785619fabe /core
parent327cc8f40e4488dda19492999494ff7c992e9c47 (diff)
parent470879c21ccf17d37eacde0990e1236389c88b42 (diff)
downloadframeworks_base-305bf62f59935f2743df497fb9524ac18b69fec5.zip
frameworks_base-305bf62f59935f2743df497fb9524ac18b69fec5.tar.gz
frameworks_base-305bf62f59935f2743df497fb9524ac18b69fec5.tar.bz2
Merge "Add option for MVNO roaming fix. Making commit bc097e94dfd15ecaac4d057d30c68d9c77a54744 switchable." into froyo
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/Settings.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 8614862..cc5b515 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2671,6 +2671,8 @@ public final class Settings {
@Deprecated
public static final String WIFI_WATCHDOG_PING_TIMEOUT_MS =
Secure.WIFI_WATCHDOG_PING_TIMEOUT_MS;
+
+ public static final String BUTTON_MVNO_ROAMING_KEY = "button_mvno_roaming_key";
}
/**