diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-28 14:01:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-28 14:01:17 +0000 |
| commit | 0f4ca4a5c086899f4ab842ae70eb4c9474d2547a (patch) | |
| tree | d0afa4eeb3791bdc71dc4a74a0b257204fe4cc05 /libs/androidfw/AssetManager.cpp | |
| parent | 49b368b4479fa2a1191d1cbd1105e152435c1cb2 (diff) | |
| parent | a272d540d8ecf913ce71abed58fc4a84a36ce258 (diff) | |
Merge "Don't use cutils/Atomic.h" am: 07735797a2
am: a272d540d8
Change-Id: Ie442c255e43f2ebe80ef5423aa4508930d72c44c
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> |