commit 3e9d9c0139f84bac4469fc091556b44475fcbfba
author Tadashi G. Takaoka <takaoka@google.com> Thu Aug 28 03:42:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 28 03:42:33 2014 +0000
tree cd7a348d6a1c240856fdfd1eb5fe2f216aa22e85
parent 67d06843551b793fc5375b35248d70c92203d81f
parent d9069ea076310a7e3c4d8fddb5dc80ee840bdc98

am d9069ea0: Merge "Fix Hinglish subtype locale test"

* commit 'd9069ea076310a7e3c4d8fddb5dc80ee840bdc98':
  Fix Hinglish subtype locale test

tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java

diff --git a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
index 5afbbbe..c095e68 100644
--- a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
+++ b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
@@ -263,7 +263,7 @@
                         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));