Projects information

Chunk

Conflicting content
private static ThrottleManager sThrottleManager; private static WifiManager sWifiManager; private static LocationManager sLocationManager; <<<<<<< HEAD private static CountryDetector sCountryDetector; ======= >>>>>>> 6066da89a464d2bd5f002f5e687d40876ed5ce21 private static final HashMap sSharedPrefs = new HashMap();

Conflicting content

    private static ThrottleManager sThrottleManager;
    private static WifiManager sWifiManager;
    private static LocationManager sLocationManager;
<<<<<<< HEAD
    private static CountryDetector sCountryDetector;
=======
>>>>>>> 6066da89a464d2bd5f002f5e687d40876ed5ce21
    private static final HashMap sSharedPrefs =
            new HashMap();

Solution content
private static ThrottleManager sThrottleManager; private static WifiManager sWifiManager; private static LocationManager sLocationManager; private static CountryDetector sCountryDetector; private static final HashMap sSharedPrefs = new HashMap();

Solution content

    private static ThrottleManager sThrottleManager;
    private static WifiManager sWifiManager;
    private static LocationManager sLocationManager;
    private static CountryDetector sCountryDetector;
    private static final HashMap sSharedPrefs =
            new HashMap();

File
ContextImpl.java

Developer's decision
Version 1

Kind of conflict
Attribute

Projects >> android-frameworks-base-with-remote-control-service >>22b0eade14561db394187ec75a9e300f3591ebda