summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/FastMixer.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-23 19:34:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-23 19:34:00 +0000
commit24ffe7a9161943c8ba2353e956653a71af564b5d (patch)
tree8bcf08421a8dc8e92b61c5877a7378ef23a86098 /services/audioflinger/FastMixer.cpp
parentd6b1efbc99de43d56aa6a4123126e994e7c2c30e (diff)
parent79262cfc14a9d8b5aa29d43e84ea91eedb9492ba (diff)
downloadframeworks_av-24ffe7a9161943c8ba2353e956653a71af564b5d.zip
frameworks_av-24ffe7a9161943c8ba2353e956653a71af564b5d.tar.gz
frameworks_av-24ffe7a9161943c8ba2353e956653a71af564b5d.tar.bz2
am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
* commit '79262cfc14a9d8b5aa29d43e84ea91eedb9492ba': 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 6f347ee..130a7e7 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>