Projects >> android-frameworks-base-with-screenshot-tweaks >>b23896da46a9290b9e8c7b1e540d4d4a6cebcfab

Chunk
Conflicting content 
        setVpnDns();
<<<<<<< HEAD
=======
        setState(VpnState.CONNECTED);
        saveSelf();
        setState(VpnState.CONNECTED);
>>>>>>> ac1e59d887651220f5367cc7fa4207b34eab774d

        startConnectivityMonitor();
    }
Solution content 
        setState(VpnState.CONNECTED);
        saveSelf();
        setVpnDns();

        startConnectivityMonitor();
    }
File
VpnService.java
Developer's decision
Version 1
Kind of conflict
Method invocation