Projects >> android_frameworks_base >>c4791bd65cdf2e487c87da0d863140337e5141cb

Chunk
Conflicting content 
    }

    void dispatchDetachedFromWindow() {
<<<<<<< HEAD
        if (mView != null && mView.mAttachInfo != null) {
=======
        if (Config.LOGV) Log.v(TAG, "Detaching in " + this + " of " + mSurface);

        if (mView != null && mAttached) {
>>>>>>> 5e3562a5a51789ca179895c960827af5a8f0c96d
            mView.dispatchDetachedFromWindow();
            mAttached = false;
        }
Solution content 
    }

    void dispatchDetachedFromWindow() {
        if (mView != null && mView.mAttachInfo != null) {
            mView.dispatchDetachedFromWindow();
            mAttached = false;
        }
File
ViewRoot.java
Developer's decision
Version 1
Kind of conflict
If statement