Projects >> platform_frameworks_base >>ca3a6dc41418da152d154245c59054f7d0f0d679

Chunk
Conflicting content 
     */
    public void emulateShiftHeld() {
        if (0 == mNativeClass) return; // client isn't initialized
<<<<<<< HEAD
        setUpSelectXY();
=======
        mExtendSelection = false;
        mShiftIsPressed = true;
        nativeHideCursor();
>>>>>>> 45011f2dc56e99c00bd1f3abff4f11d6df644d80
    }

    private boolean commitCopy() {
Solution content 
     */
    public void emulateShiftHeld() {
        if (0 == mNativeClass) return; // client isn't initialized
        setUpSelectXY();
    }

    private boolean commitCopy() {
File
WebView.java
Developer's decision
Version 1
Kind of conflict
Method invocation