Projects >> android_frameworks_base >>62388cfc1fb2483eb6582ccb8e36d47f16bf01fa

Chunk
Conflicting content 
import android.os.Parcel;
import android.os.SystemProperties;
<<<<<<< HEAD
=======
import android.telephony.PhoneNumberUtils;
import android.text.format.Time;
>>>>>>> a38fad37c21a13ddf1cc14e5a960f395af558ee8
import android.util.Config;
import android.util.Log;
import com.android.internal.telephony.IccUtils;
Solution content 
import android.os.Parcel;
import android.os.SystemProperties;
import android.telephony.PhoneNumberUtils;
import android.util.Config;
import android.util.Log;
import com.android.internal.telephony.IccUtils;
File
SmsMessage.java
Developer's decision
Combination
Kind of conflict
Import