diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-09-26 20:15:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 20:15:45 -0700 |
| commit | 68b7a6d14b68b38324ffd275c7227805c7d99b2d (patch) | |
| tree | 3cf95847e5d9073f0a8e01f6620df720f4827d1b /api | |
| parent | 0b1711582ff07d6d1e8e4de6c057eaf6a3473ac3 (diff) | |
| parent | bdfce2ec05a3e9ca6acd6711de6133e06f2446e6 (diff) | |
| download | frameworks_base-68b7a6d14b68b38324ffd275c7227805c7d99b2d.zip frameworks_base-68b7a6d14b68b38324ffd275c7227805c7d99b2d.tar.gz frameworks_base-68b7a6d14b68b38324ffd275c7227805c7d99b2d.tar.bz2 | |
Merge "First step towards cleaning up Global settings." into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 177b787..91e5ddd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18917,7 +18917,7 @@ package android.provider { field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS = "wifi_watchdog_background_check_timeout_ms"; field public static final deprecated java.lang.String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT = "wifi_watchdog_initial_ignored_ping_count"; field public static final deprecated java.lang.String WIFI_WATCHDOG_MAX_AP_CHECKS = "wifi_watchdog_max_ap_checks"; - field public static final java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on"; + field public static final deprecated java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on"; field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count"; field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms"; field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms"; |