Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev

2014-07-23 10:24:47 +00:00
parent e191f901d9 4c6ce23816
commit c9e2716f7b
1 changed files with 1 additions and 9 deletions
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -1824,15 +1824,7 @@ public class Resources {
            remainder = languageTag.substring(separator);
        }

-        if ("id".equals(language)) {
-            return "in" + remainder;
-        } else if ("yi".equals(language)) {
-            return "ji" + remainder;
-        } else if ("he".equals(language)) {
-            return "iw" + remainder;
-        } else {
-            return languageTag;
-        }
+        return Locale.adjustLanguageCode(language) + remainder;
    }

    /**