resolved conflicts for merge of f0c4f0dd to mnc-dev

Change-Id: I16df088016c010aa25ee73ea8e68b3db8c0449e3

diff --cc services/core/java/com/android/server/LocationManagerService.java
index 1683485,974e169..3879676
--- 1/services/core/java/com/android/server/LocationManagerService.java
--- 2/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@@ -60,6 -60,9 +60,7 @@@ import android.location.Address
  import android.location.Criteria;
  import android.location.GeocoderParams;
  import android.location.Geofence;
 -import android.location.GpsMeasurementsEvent;
 -import android.location.GpsNavigationMessageEvent;
+ import android.location.IGpsGeofenceHardware;
  import android.location.IGpsMeasurementsListener;
  import android.location.IGpsNavigationMessageListener;
  import android.location.IGpsStatusListener;

diff --cc services/core/java/com/android/server/location/GpsLocationProvider.java
Simple merge