am ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge "Fix length of pattern...

[android/aapt.git] / ZipFile.cpp

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

-#include <androidfw/ZipUtils.h>

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

+#include <utils/ZipUtils.h>

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