diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-08-30 15:07:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-30 15:07:15 -0700 |
| commit | 59e2147cb3548ad08fe8889b550e777a5da08d45 (patch) | |
| tree | 7e4161d4030b94fb864eb126f3488e7d0a8331b6 /services/audioflinger/AudioMixer.h | |
| parent | c5c313e62760ae0c0b15a3c1f6207635a41d8d33 (diff) | |
| parent | f351faed1f54aac8a06b6685dc77a7764d7cf543 (diff) | |
| download | frameworks_av-59e2147cb3548ad08fe8889b550e777a5da08d45.zip frameworks_av-59e2147cb3548ad08fe8889b550e777a5da08d45.tar.gz frameworks_av-59e2147cb3548ad08fe8889b550e777a5da08d45.tar.bz2 | |
am b9cba9b7: Merge "Move libnbaio out of AudioFlinger" into jb-mr1-dev
* commit 'b9cba9b731195d4387ee21b7e9ba1137a3cfda68':
Move libnbaio out of AudioFlinger
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 46deae7..6e34cd1 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -23,7 +23,7 @@ #include <utils/threads.h> -#include "AudioBufferProvider.h" +#include <media/AudioBufferProvider.h> #include "AudioResampler.h" #include <audio_effects/effect_downmix.h> |