diff options
| author | Patrick Scott <phanna@android.com> | 2011-03-16 12:35:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 12:35:39 -0700 |
| commit | bf3ccfe8edd3e81d22d85f43c08c213a0c9adc65 (patch) | |
| tree | a73c705bccae1230832143b4f7f6845f2ab1f189 /res | |
| parent | a302bf8343557b286ac12eab198e3a88434eee45 (diff) | |
| parent | 17ece4d82a02542d24ec7b7929c162ddd3622055 (diff) | |
| download | packages_apps_Browser-bf3ccfe8edd3e81d22d85f43c08c213a0c9adc65.zip packages_apps_Browser-bf3ccfe8edd3e81d22d85f43c08c213a0c9adc65.tar.gz packages_apps_Browser-bf3ccfe8edd3e81d22d85f43c08c213a0c9adc65.tar.bz2 | |
am 17ece4d8: Merge "Remove settings string." into honeycomb-mr1
* commit '17ece4d82a02542d24ec7b7929c162ddd3622055':
Remove settings string.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 9f339f5..9684fcf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -382,7 +382,7 @@ <!-- Auto login preference title [CHAR-LIMIT=32] --> <string name="pref_autologin_title">Automatic Google sign-in</string> <!-- Message shown during auto login [CHAR-LIMIT=none] --> - <string name="pref_autologin_progress">Signing into Google sites using <xliff:g>%s</xliff:g>\nYour privacy & security settings control automatic Google sign-in</string> + <string name="pref_autologin_progress">Signing into Google sites using <xliff:g>%s</xliff:g></string> <!-- Auto-login bar description [CHAR-LIMIT=40] --> <string name="autologin_bar_text">Automatic sign-in is available.</string> <!-- Login button [CHAR-LIMIT=10] --> |