summaryrefslogtreecommitdiff
path: root/include/androidfw/AssetManager.h
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 /include/androidfw/AssetManager.h
parent9346c28c8200a56f49f89931e9f6155b82cde32b (diff)
parenta982dc05d7ca919c07f50e446549ef9dceadf6bd (diff)
Merge "frameworks/base: move Zip* from libandroidfw to libutils"
Diffstat (limited to 'include/androidfw/AssetManager.h')
-rw-r--r--include/androidfw/AssetManager.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h
index d95b45e98554..d153c3155568 100644
--- a/include/androidfw/AssetManager.h
+++ b/include/androidfw/AssetManager.h
@@ -22,13 +22,13 @@
#include <androidfw/Asset.h>
#include <androidfw/AssetDir.h>
-#include <androidfw/ZipFileRO.h>
#include <utils/KeyedVector.h>
#include <utils/SortedVector.h>
#include <utils/String16.h>
#include <utils/String8.h>
#include <utils/threads.h>
#include <utils/Vector.h>
+#include <utils/ZipFileRO.h>
/*
* Native-app access is via the opaque typedef struct AAssetManager in the C namespace.