Projects >> platform_frameworks_base >>45991bc13fd705044af2e7f3aa194e72e51f493f

Chunk
Conflicting content 
        nativeUpdateCachedTextfield(updatedText, mTextGeneration);
    }

<<<<<<< HEAD
    /*package*/ void autoFillForm(int autoFillQueryId) {
        mWebViewCore.sendMessage(EventHub.AUTOFILL_FORM, autoFillQueryId, /* unused */0);
=======
    /* package */ ViewManager getViewManager() {
        return mViewManager;
>>>>>>> d2607118edf7a5204181dd118dd2f64d1d5b12c4
    }

    private native int nativeCacheHitFramePointer();
Solution content 
        nativeUpdateCachedTextfield(updatedText, mTextGeneration);
    }

    /*package*/ void autoFillForm(int autoFillQueryId) {
        mWebViewCore.sendMessage(EventHub.AUTOFILL_FORM, autoFillQueryId, /* unused */0);
    }

    /* package */ ViewManager getViewManager() {
        return mViewManager;
    }

    private native int nativeCacheHitFramePointer();
File
WebView.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Method signature
Return statement