diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-28 14:13:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-28 14:13:52 +0000 |
| commit | df7675f1cb184f09b2a304d1aa8a25112d6b340f (patch) | |
| tree | b0b2e7f23e976ba854c7403360da3ea0d681eacf /cmds/bootanimation/BootAnimation.cpp | |
| parent | efab39ff7f06323568f6b1a401209f06521486d3 (diff) | |
| parent | 0f4ca4a5c086899f4ab842ae70eb4c9474d2547a (diff) | |
Merge "Don't use cutils/Atomic.h" am: 07735797a2 am: a272d540d8
am: 0f4ca4a5c0
Change-Id: I4b9798b39d890537f888415b5ac283227970e4de
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 54785ca13185..8ffe5bf59315 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -29,11 +29,11 @@ #include <signal.h> #include <time.h> +#include <cutils/atomic.h> #include <cutils/properties.h> #include <androidfw/AssetManager.h> #include <binder/IPCThreadState.h> -#include <utils/Atomic.h> #include <utils/Errors.h> #include <utils/Log.h> #include <utils/SystemClock.h> |