am d9069ea0: Merge "Fix Hinglish subtype locale test"

* commit 'd9069ea076310a7e3c4d8fddb5dc80ee840bdc98':
  Fix Hinglish subtype locale test
This commit is contained in:
Tadashi G. Takaoka 2014-08-28 03:42:33 +00:00 committed by Android Git Automerger
commit 3e9d9c0139

View file

@ -263,7 +263,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase {
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(DE));
assertEquals("de_CH", "Allemand (Suisse)",
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(DE_CH));
assertEquals("hi_ZZ", "Hinglish",
assertEquals("hi_ZZ", "Hindi/Anglais",
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_ZZ));
assertEquals("zz", "Alphabet latin (QWERTY)",
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(ZZ));