diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-01-14 05:28:39 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-01-14 05:28:39 -0800 |
| commit | fcfe64f4ed0c11f364f511ed7239e3f6fd05c393 (patch) | |
| tree | 34c530011b6593dd3ae462244cd6697a613bc7eb /java/res | |
| parent | ab074f01707c0f55c02b14dec6a773b3e07d423c (diff) | |
| parent | cb547f6ddbc61126465a385799050d20cac8d8e0 (diff) | |
| download | latinime-fcfe64f4ed0c11f364f511ed7239e3f6fd05c393.tar.gz latinime-fcfe64f4ed0c11f364f511ed7239e3f6fd05c393.tar.xz latinime-fcfe64f4ed0c11f364f511ed7239e3f6fd05c393.zip | |
am cb547f6d: am 5a88787e: Merge "Add SubtypeLocale class" into honeycomb
* commit 'cb547f6ddbc61126465a385799050d20cac8d8e0':
Add SubtypeLocale class
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/donottranslate.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 8dc212279..6a1069e99 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -138,4 +138,14 @@ <item>4</item> <item>5</item> </string-array> + + <!-- Subtype locale name exceptions --> + <string-array name="subtype_locale_exception_keys"> + <item>en_US</item> + <item>en_GB</item> + </string-array> + <string-array name="subtype_locale_exception_values"> + <item>English (US)</item> + <item>English (UK)</item> + </string-array> </resources> |