Projects information

Chunk

Conflicting content
mContactsTab = false; break; case MODE_PICK_PHONE: <<<<<<< HEAD mLocalizedLabels = EditContactActivity.getLabelsForKind(mContext, Contacts.KIND_PHONE); ======= mLocalizedLabels = EditContactActivity.getLabelsForKind(mContext, Contacts.KIND_PHONE); >>>>>>> 0dc5accbdb4d51a3be1452ca6c25e15f3396540a mDisplaySectionHeaders = false; mContactsTab = false; break;

Conflicting content

                    mContactsTab = false;
                    break;
                case MODE_PICK_PHONE:
<<<<<<< HEAD
                	 mLocalizedLabels = EditContactActivity.getLabelsForKind(mContext,
                             Contacts.KIND_PHONE);
=======
                    mLocalizedLabels = EditContactActivity.getLabelsForKind(mContext,
                            Contacts.KIND_PHONE);
>>>>>>> 0dc5accbdb4d51a3be1452ca6c25e15f3396540a
                    mDisplaySectionHeaders = false;
                    mContactsTab = false;
                    break;

Solution content
mContactsTab = false; break; case MODE_PICK_PHONE: mLocalizedLabels = EditContactActivity.getLabelsForKind(mContext, Contacts.KIND_PHONE); mDisplaySectionHeaders = false; mContactsTab = false; break;

File
ContactsListActivity.java

Developer's decision
Version 1

Kind of conflict
Attribute
Method invocation

Projects >> packages_apps_Contacts >>e67d293dac7e8a32619d3fdcffc83464c3d4e1b2