Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev (c9e2716f) · Commits · e / os / android_frameworks_base

core/java/android/content/res/Resources.java

+1 −9

Original line number	Diff line number	Diff line
		@@ -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;
		}

		/**