Projects >> platform_frameworks_base >>888461c801b531f31b2ef34617d333d781d93010

Chunk
Conflicting content 
            mContext.getRenderResources().setLogger(null);
        }

<<<<<<< HEAD
=======
        mContext = null;
>>>>>>> 1103ece28c695fc26fcee812870c553dca8d840d
    }

    public static BridgeContext getCurrentContext() {
Solution content 
            mContext.getRenderResources().setLogger(null);
        }

    }

    public static BridgeContext getCurrentContext() {
File
RenderAction.java
Developer's decision
Version 1
Kind of conflict
Attribute