Projects >> packages_apps_Contacts >>9c38fddc7187742e19147093982754c13a502680

Chunk
Conflicting content 
package com.android.contacts;

<<<<<<< HEAD
=======
import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.TelephonyCapabilities;
import com.android.internal.telephony.TelephonyIntents;

>>>>>>> 49e63562777f6089d1b63c0f78c14a0566a7bc91
import android.app.AlertDialog;
import android.app.KeyguardManager;
import android.app.ProgressDialog;
Solution content 
package com.android.contacts;

import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.TelephonyCapabilities;
import com.android.internal.telephony.TelephonyIntents;

import android.app.AlertDialog;
import android.app.KeyguardManager;
import android.app.ProgressDialog;
File
SpecialCharSequenceMgr.java
Developer's decision
Version 2
Kind of conflict
Import