3 files changed, 3 insertions, 14 deletions
diff --git a/tools/makedict/Android.mk b/tools/makedict/Android.mk
index 2f0957aa8..7b5dee2ce 100644
--- a/tools/makedict/Android.mk
+++ b/tools/makedict/Android.mk
@@ -24,7 +24,6 @@ LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \
         $(filter-out $(addprefix %, $(LOCAL_TOOL_SRC_FILES)), $(LOCAL_MAIN_SRC_FILES))
 LOCAL_SRC_FILES += $(call all-java-files-under,tests)
 LOCAL_JAR_MANIFEST := etc/manifest.txt
-LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := makedict
 LOCAL_JAVA_LIBRARIES := junit
 
diff --git a/tools/makedict/etc/Android.mk b/tools/makedict/etc/Android.mk
index 96a90cbe0..1b7d7cf0e 100644
--- a/tools/makedict/etc/Android.mk
+++ b/tools/makedict/etc/Android.mk
@@ -15,7 +15,5 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := eng
-
 LOCAL_PREBUILT_EXECUTABLES := makedict
 include $(BUILD_HOST_PREBUILT)
diff --git a/tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl b/tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
index 8df94c1aa..f6c84eaf2 100644
--- a/tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
+++ b/tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
@@ -47,7 +47,7 @@ public final class KeyboardTextsSet {
     // Language to texts map.
     private static final HashMap<String, String[]> sLocaleToTextsMap =
             new HashMap<String, String[]>();
-    private static final HashMap<String, Integer> sLowerCaseNameToIdsMap =
+    private static final HashMap<String, Integer> sNameToIdsMap =
             new HashMap<String, Integer>();
 
     private String[] mTexts;
@@ -77,19 +77,11 @@ public final class KeyboardTextsSet {
     }
 
     public String getText(final String name) {
-        String lowerCaseName = null;
         String text = mResourceNameToTextsMap.get(name);
-        if (text == null) {
-            lowerCaseName = name.toLowerCase();
-            text = mResourceNameToTextsMap.get(lowerCaseName);
-        }
         if (text != null) {
             return text;
         }
-        Integer id = sLowerCaseNameToIdsMap.get(name);
-        if (id == null) {
-            id = sLowerCaseNameToIdsMap.get(lowerCaseName); // lowerCaseName != null
-        }
+        final Integer id = sNameToIdsMap.get(name);
         if (id == null) throw new RuntimeException("Unknown label: " + name);
         text = (id < mTexts.length) ? mTexts[id] : null;
         return (text == null) ? LANGUAGE_DEFAULT[id] : text;
@@ -131,7 +123,7 @@ public final class KeyboardTextsSet {
     static {
         int id = 0;
         for (final String name : NAMES) {
-            sLowerCaseNameToIdsMap.put(name, id++);
+            sNameToIdsMap.put(name, id++);
         }
 
         for (int i = 0; i < LANGUAGES_AND_TEXTS.length; i += 2) {