summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-16 14:36:56 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-16 14:36:56 -0400
commit764916d01b779ccc8064946c6ba2962fe063ed86 (patch)
tree59db3bc96de8bb3473ad2e55866c27f389c7401c /core/res
parentfee6b69a7ce38118423c114abb977fd1b053be3c (diff)
parentee452ee5359cdfa3c3fbf6783722d3aaa2ec5ca6 (diff)
downloadframeworks_base-764916d01b779ccc8064946c6ba2962fe063ed86.zip
frameworks_base-764916d01b779ccc8064946c6ba2962fe063ed86.tar.gz
frameworks_base-764916d01b779ccc8064946c6ba2962fe063ed86.tar.bz2
Merge change 23383 into eclair
* changes: Combine the "Permission Requested" title and subtitle into one string.
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 69ddd63..bd79c75 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1962,7 +1962,7 @@
<string name="allow">Allow</string>
<string name="deny">Deny</string>
<string name="permission_request_notification_title">Permission Requested</string>
- <string name="permission_request_notification_subtitle">for account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g></string>
+ <string name="permission_request_notification_with_subtitle">Permission Requested\nfor account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g></string>
<!-- Label to show for a service that is running because it is an input method. -->
<string name="input_method_binding_label">Input method</string>