Projects >> frameworks_base_disabled >>d6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa

Chunk
Conflicting content 
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
<<<<<<< HEAD
import android.os.Handler;
import android.os.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
=======
>>>>>>> 2b9a49a30d2ce1176cbd90741897705bec32d0bd
import android.widget.Toast;
import android.util.Log;
import android.location.LocationManager;
Solution content 
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import android.widget.Toast;
import android.util.Log;
import android.location.LocationManager;
File
NetInitiatedActivity.java
Developer's decision
Version 2
Kind of conflict
Import