Projects >> platform_frameworks_base >>2528fcdfbd5d674c00387ed4ce93546ea5581ede

Chunk
Conflicting content 
            String className,
            String methodName,
            String desc,
<<<<<<< HEAD
            boolean isStatic) {
        super(Main.ASM_VERSION);
=======
            boolean isStatic,
            boolean isStaticClass) {
        super(Opcodes.ASM4);
>>>>>>> 26ada7e78993241d702a908eae93d174cbb3c8b3
        mLog = log;
        mOrgWriter = mvOriginal;
        mDelWriter = mvDelegate;
Solution content 
            String className,
            String methodName,
            String desc,
            boolean isStatic) {
        super(Main.ASM_VERSION);
        mLog = log;
        mOrgWriter = mvOriginal;
        mDelWriter = mvDelegate;
File
DelegateMethodAdapter.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable