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

[android/aapt.git] / ZipFile.cpp

diff --git a/ZipFile.cpp b/ZipFile.cpp
index 0705be3380dbec3585f8917f200fe41e64c5214a..3994c3190a74f84248a18df50a722bd057bf33a4 100644 (file)
--- a/ZipFile.cpp
+++ b/ZipFile.cpp
@@ -20,8 +20,8 @@
 
 #define LOG_TAG "zip"
 
 
 #define LOG_TAG "zip"
 

-#include <utils/ZipUtils.h>

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

+#include <utils/ZipUtils.h>

 
 #include "ZipFile.h"
 
 
 #include "ZipFile.h"