2 files changed, 5 insertions, 2 deletions
diff --git a/ide_common/src/com/android/ide/common/resources/configuration/LanguageQualifier.java b/ide_common/src/com/android/ide/common/resources/configuration/LanguageQualifier.java
index ff18bdc..972a50f 100644
--- a/ide_common/src/com/android/ide/common/resources/configuration/LanguageQualifier.java
+++ b/ide_common/src/com/android/ide/common/resources/configuration/LanguageQualifier.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.common.resources.configuration;
 
+import java.util.Locale;
 import java.util.regex.Pattern;
 
 /**
@@ -51,7 +52,7 @@ public final class LanguageQualifier extends ResourceQualifier {
      * @param value the value of the qualifier, as returned by {@link #getValue()}.
      */
     public static String getFolderSegment(String value) {
-        String segment = value.toLowerCase();
+        String segment = value.toLowerCase(Locale.US);
         if (sLanguagePattern.matcher(segment).matches()) {
             return segment;
         }
diff --git a/ide_common/src/com/android/ide/common/resources/configuration/RegionQualifier.java b/ide_common/src/com/android/ide/common/resources/configuration/RegionQualifier.java
index 7e8ca9a..2b9c29e 100644
--- a/ide_common/src/com/android/ide/common/resources/configuration/RegionQualifier.java
+++ b/ide_common/src/com/android/ide/common/resources/configuration/RegionQualifier.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.common.resources.configuration;
 
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -54,7 +55,8 @@ public final class RegionQualifier extends ResourceQualifier {
      */
     public static String getFolderSegment(String value) {
         if (value != null) {
-            String segment = "r" + value.toUpperCase(); //$NON-NLS-1$
+            // See http://developer.android.com/reference/java/util/Locale.html#default_locale
+            String segment = "r" + value.toUpperCase(Locale.US); //$NON-NLS-1$
             if (sRegionPattern.matcher(segment).matches()) {
                 return segment;
             }