summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2011-06-20 16:28:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-20 16:28:09 -0700
commita7bb204a1a4a46c853c3590027ad5bffb294f738 (patch)
tree5b68ceb16ec7f365714f46b6a66b52e909775a42 /res
parentf3670df2ca8e521179907978c7009cba791df7c4 (diff)
parentc6f144106c627b28d90d33c54564c70890bc2f42 (diff)
downloadpackages_apps_settings-a7bb204a1a4a46c853c3590027ad5bffb294f738.zip
packages_apps_settings-a7bb204a1a4a46c853c3590027ad5bffb294f738.tar.gz
packages_apps_settings-a7bb204a1a4a46c853c3590027ad5bffb294f738.tar.bz2
am c6f14410: Merge "Remove CHAR LIMIT from string to fix build." into gingerbread
* commit 'c6f144106c627b28d90d33c54564c70890bc2f42': Remove CHAR LIMIT from string to fix build.
Diffstat (limited to 'res')
-rwxr-xr-xres/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a39dfd5..44246dc 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -281,7 +281,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>