summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-06-22 21:11:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-22 21:11:01 -0700
commitaef3981e86909a6a5b4f6ecab972e43fd77582c1 (patch)
treeaabae94510b14f1cbfe43227ddc7ad8a7c03e622
parent811d5c154e1f4db30cbe1ef57631f3c7971333c4 (diff)
parent382b8be0881ed835609063567329d4f3bfc9ea75 (diff)
downloadpackages_apps_settings-aef3981e86909a6a5b4f6ecab972e43fd77582c1.zip
packages_apps_settings-aef3981e86909a6a5b4f6ecab972e43fd77582c1.tar.gz
packages_apps_settings-aef3981e86909a6a5b4f6ecab972e43fd77582c1.tar.bz2
Merge "Fix build."
-rw-r--r--res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ede8799..986d867 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -289,7 +289,7 @@
<string name="bluetooth_connection_notif_message">"Touch to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022"</string>
<!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
- <string name="bluetooth_connection_dialog_text [CHAR LIMIT=none]">"Do you want to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022?"</string>
+ <string name="bluetooth_connection_dialog_text">"Do you want to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022?"</string>
<!-- Date & time settings screen title -->
<string name="date_and_time">Date &amp; time settings</string>