diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-08 16:45:10 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 16:45:10 +0100 |
| commit | 918b183295052880f41beeb632fa8f14ada81b59 (patch) | |
| tree | a260f1b21ca94a35e900eeb0ef6ca93e940462c3 /core/res | |
| parent | 1a65b441b127e66c0fae2e04e6f88628a6363209 (diff) | |
| download | frameworks_base-918b183295052880f41beeb632fa8f14ada81b59.zip frameworks_base-918b183295052880f41beeb632fa8f14ada81b59.tar.gz frameworks_base-918b183295052880f41beeb632fa8f14ada81b59.tar.bz2 | |
Merge Chromium at r12.0.742.93: New autofill string
Added a string that we now use.
Change-Id: I6df3f2b5c2f01e4d757dadb048cb53bfe9819ff9
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 50f8df7..97a8c0b 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2085,6 +2085,10 @@ <!-- Do not translate. Regex used by AutoFill. --> <string name="autofill_phone_suffix_separator_re">^-$</string> + <!-- Do not translate. Regex used by AutoFill. --> + <!-- Ex: ************1234 --> + <string name="credit_card_number_preview_format">$1</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_readHistoryBookmarks">read Browser\'s history and bookmarks</string> |