Projects >> frameworks_base_disabled >>baaaca1c6164eff17488a178859295a1d5be9171

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;
>>>>>>> ee4c17eec30b270f9a91cc92b40fc56435a59027
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