diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 22:42:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 22:42:46 +0000 |
| commit | 5b756bfdaa27c8b606720544bf507213cf47376d (patch) | |
| tree | 7c6886aba2268ee29d8a7d9c025b259458022574 /services | |
| parent | c10b874c4d0d6208fb93a7aa0dc8af4418faad45 (diff) | |
| parent | 8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0 (diff) | |
| download | frameworks_av-5b756bfdaa27c8b606720544bf507213cf47376d.zip frameworks_av-5b756bfdaa27c8b606720544bf507213cf47376d.tar.gz frameworks_av-5b756bfdaa27c8b606720544bf507213cf47376d.tar.bz2 | |
am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
* commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0':
Move frameworks/av off <sys/atomics.h>.
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/FastMixer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index acd3be7..6d87838 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -26,7 +26,6 @@ #define ATRACE_TAG ATRACE_TAG_AUDIO #include "Configuration.h" -#include <sys/atomics.h> #include <time.h> #include <utils/Log.h> #include <utils/Trace.h> |