Projects >> platform_packages_apps_contacts >>3982a90600fbe76c770acc63da1afd77820b254a

Chunk
Conflicting content 
package com.android.contacts.list;

<<<<<<< HEAD
=======
import com.android.contacts.ContactsSearchManager;

>>>>>>> 67d3ba117d6305f826be33f1d8861e06289fc457
import android.app.Activity;
import android.app.SearchManager;
import android.content.Intent;
Solution content 
package com.android.contacts.list;

import com.android.contacts.ContactsSearchManager;

import android.app.Activity;
import android.app.SearchManager;
import android.content.Intent;
File
ContactsIntentResolver.java
Developer's decision
Version 2
Kind of conflict
Import