diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-25 16:12:29 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 18:54:31 +0100 |
| commit | a014db7f0b14e0a68a2ddef36b603b204a9f0499 (patch) | |
| tree | de60a21794224de8373f9e7ab41df457be4777ff /core/java/android | |
| parent | f8355d5489a52dcdd904afb48c0f170886becdae (diff) | |
| download | frameworks_base-a014db7f0b14e0a68a2ddef36b603b204a9f0499.zip frameworks_base-a014db7f0b14e0a68a2ddef36b603b204a9f0499.tar.gz frameworks_base-a014db7f0b14e0a68a2ddef36b603b204a9f0499.tar.bz2 | |
Merge Chromium at 10.0.634.0: Add autofill fax string
Introduced here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/fax_field.cc?view=diff&pathrev=70875&r1=70709&r2=70710
Change-Id: I20130029e26f2d9ef6ea4828921b070c887ccb69
Diffstat (limited to 'core/java/android')
| -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 f59d7d0..5b4fb1d 100644 --- a/core/java/android/webkit/L10nUtils.java +++ b/core/java/android/webkit/L10nUtils.java @@ -69,7 +69,8 @@ public class L10nUtils { com.android.internal.R.string.autofill_card_number_re, // IDS_AUTOFILL_CARD_NUMBER_RE com.android.internal.R.string.autofill_expiration_month_re, // IDS_AUTOFILL_EXPIRATION_MONTH_RE com.android.internal.R.string.autofill_expiration_date_re, // IDS_AUTOFILL_EXPIRATION_DATE_RE - com.android.internal.R.string.autofill_card_ignored_re // IDS_AUTOFILL_CARD_IGNORED_RE + com.android.internal.R.string.autofill_card_ignored_re, // IDS_AUTOFILL_CARD_IGNORED_RE + com.android.internal.R.string.autofill_fax_re // IDS_AUTOFILL_FAX_RE }; private static Context mApplicationContext; |