Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b6d8426 authored by Neil Fuller's avatar Neil Fuller
Browse files

Fix a bad merge 

There was a bad interaction between
commits 6777f54f
and 23e47f56.

Change-Id: Ic408f8b4859d83d89c612748ee6e772b57830d96
parent e3ced5b6

tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -122,7 +122,8 @@ class DelegateMethodAdapter extends MethodVisitor { 
            String className,

            String className,

            String methodName,

            String methodName,

            String desc,

            String desc,

            boolean isStatic) {

            boolean isStatic,

            boolean isStaticClass) {

        super(Main.ASM_VERSION);

        super(Main.ASM_VERSION);

        mLog = log;

        mLog = log;

        mOrgWriter = mvOriginal;

        mOrgWriter = mvOriginal;