Projects >> android-frameworks-base-with-remote-control-service >>31e61185a6c34c8fd80c3283b9d80dc136b57b63

Chunk
Conflicting content 
import android.util.Config;
>>>>>>> 39ddeae0b647519f205e8d4cc334ad548ffe2ac8

import android.os.Parcel;
import android.os.SystemProperties;
<<<<<<< HEAD
=======
import android.telephony.PhoneNumberUtils;
import android.util.Log;
import com.android.internal.telephony.IccUtils;
import com.android.internal.telephony.SmsHeader;
Solution content 
import android.os.Parcel;
import android.os.SystemProperties;
import android.telephony.PhoneNumberUtils;
import android.util.Log;
import com.android.internal.telephony.IccUtils;
import com.android.internal.telephony.SmsHeader;
File
SmsMessage.java
Developer's decision
Combination
Kind of conflict
Import