am 39b58ba2: resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp

[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"
 
-#include <androidfw/ZipUtils.h>
 #include <utils/Log.h>
+#include <utils/ZipUtils.h>
 
 #include "ZipFile.h"