summaryrefslogtreecommitdiff
path: root/libs/androidfw/Asset.cpp
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2012-03-22 23:15:31 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-03-22 23:15:31 -0700
commit2e842a58ebbc3a8a0599dfb0c19d7cda7ed21e5f (patch)
treea31e137ef17976289494abcc91d85fb5bcb48d0d /libs/androidfw/Asset.cpp
parent9346c28c8200a56f49f89931e9f6155b82cde32b (diff)
parenta982dc05d7ca919c07f50e446549ef9dceadf6bd (diff)
Merge "frameworks/base: move Zip* from libandroidfw to libutils"
Diffstat (limited to 'libs/androidfw/Asset.cpp')
-rw-r--r--libs/androidfw/Asset.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/Asset.cpp b/libs/androidfw/Asset.cpp
index cb7628d1d5b1..fd5b3e458e35 100644
--- a/libs/androidfw/Asset.cpp
+++ b/libs/androidfw/Asset.cpp
@@ -23,11 +23,11 @@
#include <androidfw/Asset.h>
#include <androidfw/StreamingZipInflater.h>
-#include <androidfw/ZipFileRO.h>
-#include <androidfw/ZipUtils.h>
#include <utils/Atomic.h>
#include <utils/FileMap.h>
#include <utils/Log.h>
+#include <utils/ZipFileRO.h>
+#include <utils/ZipUtils.h>
#include <utils/threads.h>
#include <assert.h>