Projects >> android-frameworks-base-with-screenshot-tweaks >>2b15cb21b313f83f7cccdc6f9116ba31ddc190ad

Chunk
Conflicting content 
import android.location.LocationProvider;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
<<<<<<< HEAD
=======
import android.net.SntpClient;
import android.net.Uri;
>>>>>>> 75f1fdec3e95e9c8b5add02ba6e9b14913058f22
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
Solution content 
import android.location.LocationProvider;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
File
GpsLocationProvider.java
Developer's decision
Combination
Kind of conflict
Import