Bug587 - Patch

Index: brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java	(date 1387379414000)
+++ brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java	(revision )
@@ -23,6 +23,7 @@
 import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.util.Duo;
 import java.util.*;
+import java.util.logging.Logger;

 /**
  * @author Ryszard Wiśniewski <brut.alll@gmail.com>
@@ -168,9 +169,11 @@
 	}

 	public void addType(ResType type) throws AndrolibException {
-		if (mTypes.put(type.getName(), type) != null) {
-			throw new AndrolibException("Multiple types: " + type);
+        if (mTypes.containsKey(type.getName())) {
+            LOGGER.warning("Multiple types detected! " + type + " ignored!");
+        } else {
+            mTypes.put(type.getName(), type);
-		}
+        }
 	}

 	public void addResource(ResResource res) {
@@ -220,4 +223,7 @@
 		}
 		return mValueFactory;
 	}
+
+    private final static Logger LOGGER = Logger
+            .getLogger(ResPackage.class.getName());
 }