diff options
| author | 2018-02-28 14:14:22 +0000 | |
|---|---|---|
| committer | 2018-02-28 14:14:22 +0000 | |
| commit | 68618d98609ea72d1bda9b10d3a7602ea90d4064 (patch) | |
| tree | 0a7d12f9cfa1a31843d4d0e62cd27a7cfbc65d0c /libs/androidfw/AssetManager.cpp | |
| parent | 924367f6ed24705e4233d88b9a6d071c8c31c77c (diff) | |
| parent | df7675f1cb184f09b2a304d1aa8a25112d6b340f (diff) | |
Merge "Merge "Don't use cutils/Atomic.h" am: 07735797a2 am: a272d540d8 am: 0f4ca4a5c0"
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 a5698af18f6b..fc625bbaf72d 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -28,7 +28,7 @@ #include <androidfw/misc.h> #include <androidfw/ResourceTypes.h> #include <androidfw/ZipFileRO.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/Log.h> #include <utils/String8.h> #include <utils/String8.h> |