Projects >> frameworks_base_disabled >>2cd423a049aeeb0c07f7a556f3a6f701b504606f

Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    class ConnectingState extends State {
=======
    class ConnectingState extends HierarchicalState {
>>>>>>> 01ea7f01ec133285ac2397817aa015870c7da650

        @Override
        public void enter() {
Solution content 
        }
    }

    class ConnectingState extends State {

        @Override
        public void enter() {
File
WifiStateMachine.java
Developer's decision
Version 1
Kind of conflict
Class signature