From 51cce0ec42a04f94569e8da544b02c888b82b31d Mon Sep 17 00:00:00 2001
From: Deepanshu Gupta <deepanshu@google.com>
Date: Mon, 12 May 2014 19:31:25 -0700
Subject: resolve conflicts for merge 5a7b3b65 correctly

Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84
---
 tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
index 11433aa..4bcc222 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
@@ -89,7 +89,7 @@ public class Main {
         try {
             CreateInfo info = new CreateInfo();
             Set<String> excludeClasses = getExcludedClasses(info);
-            AsmGenerator agen = new AsmGenerator(log, osDestJar[0], info);
+            AsmGenerator agen = new AsmGenerator(log, osDestJar, info);
 
             AsmAnalyzer aa = new AsmAnalyzer(log, osJarPath, agen,
                     new String[] {                          // derived from
-- 
cgit v1.1