diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-28 12:37:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-28 12:37:50 +0000 |
| commit | 07735797a235ed98d182d0a40c8bdce4d92f9f0a (patch) | |
| tree | beef0d0a604cb7e430150e91819cf17f13d3beba /libs/androidfw/AssetManager.cpp | |
| parent | e8b557bc08facb3d60b605f3e8cb26b31baaa28b (diff) | |
| parent | fb7952f57e07c68cc66a3ec69f86694057f89def (diff) | |
Merge "Don't use cutils/Atomic.h"
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> |