summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/FastMixer.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-22 22:50:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-22 22:50:51 +0000
commit79262cfc14a9d8b5aa29d43e84ea91eedb9492ba (patch)
tree06df1a99ac5b80535da8be5bc9c9081968cfade5 /services/audioflinger/FastMixer.cpp
parentf285c91efbae23783fe94dc5ad19a2560e157685 (diff)
parent5b756bfdaa27c8b606720544bf507213cf47376d (diff)
downloadframeworks_av-79262cfc14a9d8b5aa29d43e84ea91eedb9492ba.zip
frameworks_av-79262cfc14a9d8b5aa29d43e84ea91eedb9492ba.tar.gz
frameworks_av-79262cfc14a9d8b5aa29d43e84ea91eedb9492ba.tar.bz2
am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
* commit '5b756bfdaa27c8b606720544bf507213cf47376d': Move frameworks/av off <sys/atomics.h>.
Diffstat (limited to 'services/audioflinger/FastMixer.cpp')
-rw-r--r--services/audioflinger/FastMixer.cpp1
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>