Allow updating TIMES_CONTACTED again.
am: f752e4fbe3

Change-Id: Ia2e838b3515ce05da7a5ec783940a537293f8f6e
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a725953..4784c4a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -24,7 +24,7 @@
     <string name="upgrade_out_of_memory_notification_text" msgid="2581831842693151968">"Zum Abschließen der Aktualisierung tippen."</string>
     <string name="default_directory" msgid="93961630309570294">"Kontakte"</string>
     <string name="local_invisible_directory" msgid="705244318477396120">"Sonstige"</string>
-    <string name="voicemail_from_column" msgid="435732568832121444">"Mailboxnachricht von "</string>
+    <string name="voicemail_from_column" msgid="435732568832121444">"Mailbox-Nachricht von "</string>
     <string name="debug_dump_title" msgid="4916885724165570279">"Kontaktdatenbank kopieren"</string>
     <string name="debug_dump_database_message" msgid="406438635002392290">"Du 1) erstellst eine Kopie deiner Datenbank, die alle Kontaktinformationen und Anruflisten auf dem internen Speicher enthält, und 2) sendest diese Kopie per E-Mail. Denke daran, die Kopie so schnell wie möglich zu löschen, nachdem du sie vom Gerät kopiert hast oder die E-Mail empfangen wurde."</string>
     <string name="debug_dump_delete_button" msgid="7832879421132026435">"Jetzt löschen"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d5c8a94..6e76912 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="sharedUserLabel" msgid="8024311725474286801">"Android Core 앱"</string>
-    <string name="app_label" msgid="3389954322874982620">"연락처 저장소"</string>
+    <string name="app_label" msgid="3389954322874982620">"주소록 저장소"</string>
     <string name="provider_label" msgid="6012150850819899907">"주소록"</string>
     <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"주소록을 업그레이드하려면 메모리가 더 필요합니다."</string>
     <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"주소록을 위한 저장소 업그레이드 중"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6a1b6d9..713fcb7 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="sharedUserLabel" msgid="8024311725474286801">"Core Apps ng Android"</string>
-    <string name="app_label" msgid="3389954322874982620">"Storage ng Mga Contact"</string>
+    <string name="app_label" msgid="3389954322874982620">"Imbakan ng Mga Contact"</string>
     <string name="provider_label" msgid="6012150850819899907">"Mga Contact"</string>
     <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"Nangangailangan ng higit pang memory ang pag-upgrade sa mga contact."</string>
     <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Ina-upgrade ang storage para sa mga contact"</string>
diff --git a/src/com/android/providers/contacts/ContactLocaleUtils.java b/src/com/android/providers/contacts/ContactLocaleUtils.java
index 3480960..2b7f1ff 100644
--- a/src/com/android/providers/contacts/ContactLocaleUtils.java
+++ b/src/com/android/providers/contacts/ContactLocaleUtils.java
@@ -425,6 +425,19 @@
             keys.add(romajiName);
             return keys.iterator();
         }
+
+        /**
+         * Returns the number for "#" bucket index.
+         * Adds an additional 'misc' bucket for Kanji characters to the base class set.
+         */
+        @Override
+        public int getNumberBucketIndex() {
+            final int numberBucketIndex = super.getNumberBucketIndex();
+            if (numberBucketIndex > mMiscBucketIndex) {
+                return numberBucketIndex + 1;
+            }
+            return numberBucketIndex;
+        }
     }
 
     /**