diff options
| author | Pavel Zhamaitsiak <pavelz@google.com> | 2014-12-08 19:16:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-08 19:16:43 +0000 |
| commit | 913c9895466c6749aa1c41b875d69d5de3e3b66b (patch) | |
| tree | 23ddc979111c3ee2c45484a3b67e4ac623df2820 /core/java/android/provider | |
| parent | e0b2fa5c57c64ffbfebcdcca0b2c96a70cf49983 (diff) | |
| parent | d89f0d3d54dec1662b1cfed6c8e574ffcc8032d9 (diff) | |
| download | frameworks_base-913c9895466c6749aa1c41b875d69d5de3e3b66b.zip frameworks_base-913c9895466c6749aa1c41b875d69d5de3e3b66b.tar.gz frameworks_base-913c9895466c6749aa1c41b875d69d5de3e3b66b.tar.bz2 | |
am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3bc74ae..0c036d51 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6118,7 +6118,7 @@ public final class Settings { /** * The number of milliseconds to delay before sending out - * {@link ConnectivityManager#CONNECTIVITY_ACTION} broadcasts. Ignored. + * {@link ConnectivityManager#CONNECTIVITY_ACTION} broadcasts. * * @hide */ |