Projects >> platform_frameworks_base >>c30ffda0d84e0c3d9b8a4ccc18b3895ae467ae40

Chunk
Conflicting content 
            Log.d(LOG_TAG, "updateMccMncConfiguration: mcc=" + mcc + ", mnc=" + mnc);

<<<<<<< HEAD
=======
        if (mcc != 0) {
            setTimezoneFromMccIfNeeded(phone, mcc);
            setLocaleFromMccIfNeeded(phone, mcc);
            setWifiChannelsFromMcc(phone, mcc);
        }
        try {
            Configuration config = ActivityManagerNative.getDefault().getConfiguration();
>>>>>>> d051434773769926671bc6f98e273e385819b653
            if (mcc != 0) {
                setTimezoneFromMccIfNeeded(phone, mcc);
                setLocaleFromMccIfNeeded(phone, mcc);
Solution content 
            Log.d(LOG_TAG, "updateMccMncConfiguration: mcc=" + mcc + ", mnc=" + mnc);

            if (mcc != 0) {
                setTimezoneFromMccIfNeeded(phone, mcc);
                setLocaleFromMccIfNeeded(phone, mcc);
File
MccTable.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Try statement
Variable