Projects >> platform_frameworks_base >>64e2b7189389118bb5309de3060c856377c0d6de

Chunk
Conflicting content 
                Selection.setSelection((Spannable)mText, start, end);

                if (hasSelection()) {
<<<<<<< HEAD
                    startSelectionActionMode();
                } else if (mInsertionPointCursorController != null) {
                    mInsertionPointCursorController.show();
=======
                    startTextSelectionMode();
>>>>>>> 6e9a021e961b3c317e92d354e99b963c85fd8952
                }
            }
        }
Solution content 
                Selection.setSelection((Spannable)mText, start, end);

                if (hasSelection()) {
                    startSelectionActionMode();
                }
            }
        }
File
TextView.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation