diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-08-30 15:09:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-30 15:09:19 -0700 |
| commit | e0c87269b94e5b24de8e9577ba32070b24e83582 (patch) | |
| tree | e17f5543a594ebf30b1c1b590b689252ae7785e1 /services/audioflinger/AudioMixer.h | |
| parent | 4657e56e0b0e9672fa2bde3c692ad4a58cf9b133 (diff) | |
| parent | c9beb01c800e6326051aee52a00659288c25c6eb (diff) | |
| download | frameworks_av-e0c87269b94e5b24de8e9577ba32070b24e83582.zip frameworks_av-e0c87269b94e5b24de8e9577ba32070b24e83582.tar.gz frameworks_av-e0c87269b94e5b24de8e9577ba32070b24e83582.tar.bz2 | |
am c9beb01c: am b9cba9b7: Merge "Move libnbaio out of AudioFlinger" into jb-mr1-dev
* commit 'c9beb01c800e6326051aee52a00659288c25c6eb':
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 66abb4f..6c80253 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> |