diff options
author | Jason Monk <jmonk@google.com> | 2014-12-08 20:29:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-08 20:29:16 +0000 |
commit | 1bcdba7b1a03da73bc335f0272f2a0a6232b0cd6 (patch) | |
tree | 9a777688b4e449397109168db9bd7fe518f1d15c /packages/Keyguard/res | |
parent | 210d9d94cf67d2dfc422978aa4e6341bea67a4e2 (diff) | |
parent | 0538e675db393777ca1090725b71d54d78fce007 (diff) | |
download | frameworks_base-1bcdba7b1a03da73bc335f0272f2a0a6232b0cd6.zip frameworks_base-1bcdba7b1a03da73bc335f0272f2a0a6232b0cd6.tar.gz frameworks_base-1bcdba7b1a03da73bc335f0272f2a0a6232b0cd6.tar.bz2 |
am 0538e675: am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev
* commit '0538e675db393777ca1090725b71d54d78fce007':
Make CarrierText handle multi-sim
Diffstat (limited to 'packages/Keyguard/res')
-rw-r--r-- | packages/Keyguard/res/values/strings.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index b97b5a3..368d789 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -380,9 +380,6 @@ you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="number">%d</xliff:g> seconds. </string> - <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash - with spaces on either side. [CHAR LIMIT=3] --> - <string name="kg_text_message_separator" product="default">" \u2014 "</string> <!-- The delete-widget drop target button text --> <string name="kg_reordering_delete_drop_target_text">Remove</string> |