resolved conflicts for merge of cf22feef to master

diff --cc src/com/android/contacts/ContactsListActivity.java
index 5d3f619,6a36229..194271d
--- 1/src/com/android/contacts/ContactsListActivity.java
--- 2/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@@ -2302,8 -2247,11 +2302,11 @@@ public class ContactsListActivity exten
              cache.labelView = (TextView) view.findViewById(R.id.label);
              cache.dataView = (TextView) view.findViewById(R.id.data);
              cache.presenceView = (ImageView) view.findViewById(R.id.presence);
 -            cache.photoView = (FasttrackBadgeWidget) view.findViewById(R.id.photo);
 +            cache.photoView = (QuickContactBadge) view.findViewById(R.id.photo);
+             if (cache.photoView != null) {
+                 cache.photoView.setExcludeMimes(new String[] {Contacts.CONTENT_ITEM_TYPE});
+             }
 -            cache.nonFastTrackPhotoView = (ImageView) view.findViewById(R.id.noFastTrackphoto);
 +            cache.nonQuickContactPhotoView = (ImageView) view.findViewById(R.id.noQuickContactPhoto);
              view.setTag(cache);
  
              return view;