am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

[android/aapt.git] / Command.cpp

diff --git a/Command.cpp b/Command.cpp
index c3a093034d7d3b39e02f30488f195c73656d2a86..08d655469a3af5d4541eb9fdbe333b3425748c6c 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -7,7 +7,6 @@
 #include "Bundle.h"
 #include "ResourceFilter.h"
 #include "ResourceTable.h"
 #include "Bundle.h"
 #include "ResourceFilter.h"
 #include "ResourceTable.h"

-#include "Images.h"

 #include "XMLNode.h"
 
 #include <utils/Log.h>
 #include "XMLNode.h"
 
 #include <utils/Log.h>