Projects >> android-frameworks-base-with-screenshot-tweaks >>329a52141c52e15caf4f0dba1735857c4ef4d478

Chunk
Conflicting content 
        if (op.equals("start")) {
            runStart();
<<<<<<< HEAD
        } else if (op.equals("startservice")) {
=======
        } else if (op.equals("start-service")) {
>>>>>>> d4dd85d532dcd383a2f6b421e747b5ab07246d19
            runStartService();
        } else if (op.equals("instrument")) {
            runInstrument();
Solution content 
        if (op.equals("start")) {
            runStart();
        } else if (op.equals("startservice")) {
            runStartService();
        } else if (op.equals("instrument")) {
            runInstrument();
File
Am.java
Developer's decision
Version 1
Kind of conflict
If statement