Projects >> packages_apps_Contacts >>36497c0babab9144e7b500e1b3e370c80181117f

Chunk
Conflicting content 
            cache.labelView = (TextView) view.findViewById(R.id.label);
            cache.dataView = (TextView) view.findViewById(R.id.data);
            cache.presenceView = (ImageView) view.findViewById(R.id.presence);
<<<<<<< HEAD
            cache.photoView = (QuickContactBadge) view.findViewById(R.id.photo);
            cache.nonQuickContactPhotoView = (ImageView) view.findViewById(R.id.noQuickContactPhoto);
=======
            cache.photoView = (FasttrackBadgeWidget) 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);
>>>>>>> cf22feefc9c022291d9c9fa6e70a59aef3552a78
            view.setTag(cache);

            return view;
Solution content 
            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 = (QuickContactBadge) view.findViewById(R.id.photo);
            if (cache.photoView != null) {
                cache.photoView.setExcludeMimes(new String[] {Contacts.CONTENT_ITEM_TYPE});
            }
            cache.nonQuickContactPhotoView = (ImageView) view.findViewById(R.id.noQuickContactPhoto);
            view.setTag(cache);

            return view;
File
ContactsListActivity.java
Developer's decision
Combination
Kind of conflict
Attribute
Cast expression
If statement
Variable