diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-28 13:51:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-28 13:51:44 +0000 |
| commit | a272d540d8ecf913ce71abed58fc4a84a36ce258 (patch) | |
| tree | 61cdecfd6ab9cf6b2fd2d394b37513d243a914f4 /libs/androidfw/AssetManager.cpp | |
| parent | 5217a340088f3f57c77a291d8ba15b768bd3c32a (diff) | |
| parent | 07735797a235ed98d182d0a40c8bdce4d92f9f0a (diff) | |
Merge "Don't use cutils/Atomic.h"
am: 07735797a2
Change-Id: Ie56fadea498f35c7e820f9fadac1b64697565a78
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 5603508eaf09..b4ccae758347 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> |