diff options
| author | 2012-03-22 23:15:31 -0700 | |
|---|---|---|
| committer | 2012-03-22 23:15:31 -0700 | |
| commit | 2e842a58ebbc3a8a0599dfb0c19d7cda7ed21e5f (patch) | |
| tree | a31e137ef17976289494abcc91d85fb5bcb48d0d /libs/androidfw/AssetManager.cpp | |
| parent | 9346c28c8200a56f49f89931e9f6155b82cde32b (diff) | |
| parent | a982dc05d7ca919c07f50e446549ef9dceadf6bd (diff) | |
Merge "frameworks/base: move Zip* from libandroidfw to libutils"
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 4829addecf59..8d59d8e9d088 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -25,13 +25,13 @@ #include <androidfw/AssetDir.h> #include <androidfw/AssetManager.h> #include <androidfw/ResourceTypes.h> -#include <androidfw/ZipFileRO.h> #include <utils/Atomic.h> #include <utils/Log.h> #include <utils/String8.h> #include <utils/String8.h> #include <utils/threads.h> #include <utils/Timers.h> +#include <utils/ZipFileRO.h> #include <assert.h> #include <dirent.h> |