Projects >> android-frameworks-base-with-remote-control-service >>4b8ad9effd95508e9966b8a3a355f0a948558ae2

Chunk
Conflicting content 
import android.content.Intent;
import android.os.AsyncResult;
import android.os.Message;
<<<<<<< HEAD
import android.os.SystemProperties;
=======
import android.provider.Telephony.Sms;
>>>>>>> 2703b84caabe7b4fb7f6c08bf7463a89b0a3169c
import android.provider.Telephony.Sms.Intents;
import android.telephony.ServiceState;
import android.telephony.SmsCbMessage;
Solution content 
import android.content.Intent;
import android.os.AsyncResult;
import android.os.Message;
import android.os.SystemProperties;
import android.provider.Telephony.Sms;
import android.provider.Telephony.Sms.Intents;
import android.telephony.ServiceState;
import android.telephony.SmsCbMessage;
File
GsmSMSDispatcher.java
Developer's decision
Concatenation
Kind of conflict
Import