merge in gingerbread-release history after reset to gingerbread
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index ac6a3a8..0b6fcf6 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -3121,7 +3121,7 @@
nameView.setText(mUnknownNameText);
}
- boolean hasPhone = cursor.getColumnCount() >= SUMMARY_HAS_PHONE_COLUMN_INDEX
+ boolean hasPhone = cursor.getColumnCount() > SUMMARY_HAS_PHONE_COLUMN_INDEX
&& cursor.getInt(SUMMARY_HAS_PHONE_COLUMN_INDEX) != 0;
// Make the call button visible if requested.