diff options
| author | 2018-02-26 18:49:26 +0000 | |
|---|---|---|
| committer | 2018-02-26 18:49:26 +0000 | |
| commit | e65ab704f9cd445ea8fdbee4c93d84b581be470a (patch) | |
| tree | 236983e645dd5ae841111d7ec35ce9365f1a077a /libs/binder/ProcessState.cpp | |
| parent | 1eb1ef28c9319865ab5a9d7e6c5dcbae873df3c2 (diff) | |
| parent | afbe4eee715bd43ee1667ace97abe8cc99e0f097 (diff) | |
Merge "Don't use cutils/Atomic.h" am: 8f4529bbc2 am: 410582488d
am: afbe4eee71
Change-Id: I4df09b7dc90a191a222b7e9a1d5ff3be3dc9bb67
Diffstat (limited to 'libs/binder/ProcessState.cpp')
| -rw-r--r-- | libs/binder/ProcessState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp index 597fca9b19..d1c6f84356 100644 --- a/libs/binder/ProcessState.cpp +++ b/libs/binder/ProcessState.cpp @@ -18,12 +18,12 @@ #include <binder/ProcessState.h> -#include <utils/Atomic.h> #include <binder/BpBinder.h> #include <binder/IPCThreadState.h> +#include <binder/IServiceManager.h> +#include <cutils/atomic.h> #include <utils/Log.h> #include <utils/String8.h> -#include <binder/IServiceManager.h> #include <utils/String8.h> #include <utils/threads.h> |