commit 1c699aabc351e44869c4e6c4e06e6c1ebcc0613a
author Michael Kolb <kolby@google.com> Wed Mar 16 13:24:46 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 16 13:24:46 2011 -0700
tree 8ec47b8698d36d5cf1b1146046d5a671454cdb4f
parent 17ece4d82a02542d24ec7b7929c162ddd3622055
parent 8a4c38243de9d19162c883d3b20df65f8bcba81a

Merge "fix qc urlbar position and show in auto-login" into honeycomb-mr1

res/values/strings.xml

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 &amp; 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] -->