Merge branch 'eclair' into eclair-release
diff --git a/src/com/android/mms/util/ContactInfoCache.java b/src/com/android/mms/util/ContactInfoCache.java
index ca59918..72a21c6 100644
--- a/src/com/android/mms/util/ContactInfoCache.java
+++ b/src/com/android/mms/util/ContactInfoCache.java
@@ -300,7 +300,7 @@
         // selection arguments, because SQLite needs to see the exact pattern of GLOB
         // to generate the correct query plan
         String selection = CALLER_ID_SELECTION.replace("+",
-                PhoneNumberUtils.getStrippedReversed(number));
+                PhoneNumberUtils.toCallerIDMinMatch(number));
         Cursor cursor = mContext.getContentResolver().query(
                 PHONES_WITH_PRESENCE_URI,
                 CALLER_ID_PROJECTION,