diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 4e2d178..3f645ae 100755
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -1218,13 +1218,13 @@
                     R.plurals.contacts_deleted_toast, contactIds.length);
         } else if (names.length == 1) {
             deleteToastMessage = getResources().getString(
-                    R.string.contacts_deleted_one_named_toast, names);
+                    R.string.contacts_deleted_one_named_toast, (Object[]) names);
         } else if (names.length == 2) {
             deleteToastMessage = getResources().getString(
-                    R.string.contacts_deleted_two_named_toast, names);
+                    R.string.contacts_deleted_two_named_toast, (Object[]) names);
         } else {
             deleteToastMessage = getResources().getString(
-                    R.string.contacts_deleted_many_named_toast, names);
+                    R.string.contacts_deleted_many_named_toast, (Object[]) names);
         }
 
         mMainHandler.post(new Runnable() {
