From 6b6d8426fe16191b8ef9187c27e7b2f7540a4197 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Fri, 19 Feb 2016 16:50:14 +0000
Subject: [PATCH] Fix a bad merge

There was a bad interaction between
commits 6777f54fa44341dd4b23456c97d97c6e4ffe915f
and 23e47f5621271db9b84f53f15a3e3d81d8b8b48d.

Change-Id: Ic408f8b4859d83d89c612748ee6e772b57830d96
---
 .../android/tools/layoutlib/create/DelegateMethodAdapter.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java
index 34209f222cc8e..da8babcbca83c 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java
@@ -122,7 +122,8 @@ class DelegateMethodAdapter extends MethodVisitor {
             String className,
             String methodName,
             String desc,
-            boolean isStatic) {
+            boolean isStatic,
+            boolean isStaticClass) {
         super(Main.ASM_VERSION);
         mLog = log;
         mOrgWriter = mvOriginal;