diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-08 11:31:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-08 11:31:33 -0700 |
| commit | 7cec24f747ce5bc70a82b951a93ba649dfefb0e6 (patch) | |
| tree | 1d16b539e7310ddb96540664ad11b882b9643bb4 /core/java/android/webkit | |
| parent | 532fee45e22acdf779c7135db9a145fe9928c50c (diff) | |
| parent | 918b183295052880f41beeb632fa8f14ada81b59 (diff) | |
| download | frameworks_base-7cec24f747ce5bc70a82b951a93ba649dfefb0e6.zip frameworks_base-7cec24f747ce5bc70a82b951a93ba649dfefb0e6.tar.gz frameworks_base-7cec24f747ce5bc70a82b951a93ba649dfefb0e6.tar.bz2 | |
Merge "Merge Chromium at r12.0.742.93: New autofill string"
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/L10nUtils.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/L10nUtils.java b/core/java/android/webkit/L10nUtils.java index 4c42cde..f9d0067d 100644 --- a/core/java/android/webkit/L10nUtils.java +++ b/core/java/android/webkit/L10nUtils.java @@ -74,7 +74,8 @@ public class L10nUtils { com.android.internal.R.string.autofill_country_code_re, // IDS_AUTOFILL_COUNTRY_CODE_RE com.android.internal.R.string.autofill_area_code_notext_re, // IDS_AUTOFILL_AREA_CODE_NOTEXT_RE com.android.internal.R.string.autofill_phone_prefix_separator_re, // IDS_AUTOFILL_PHONE_PREFIX_SEPARATOR_RE - com.android.internal.R.string.autofill_phone_suffix_separator_re // IDS_AUTOFILL_PHONE_SUFFIX_SEPARATOR_RE + com.android.internal.R.string.autofill_phone_suffix_separator_re, // IDS_AUTOFILL_PHONE_SUFFIX_SEPARATOR_RE + com.android.internal.R.string.credit_card_number_preview_format // IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT }; private static Context mApplicationContext; |