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 | b0dc8b57c7cc39a057170a0d1e5842bd866b1775 (patch) | |
| tree | b402b329bab0461cfa61e766adbdc3e015235cb1 /services/audioflinger/AudioMixer.h | |
| parent | 9370462e8ff3f15bb2d2aca80f51564d4cecf7c6 (diff) | |
| parent | 59e2147cb3548ad08fe8889b550e777a5da08d45 (diff) | |
| download | frameworks_av-b0dc8b57c7cc39a057170a0d1e5842bd866b1775.zip frameworks_av-b0dc8b57c7cc39a057170a0d1e5842bd866b1775.tar.gz frameworks_av-b0dc8b57c7cc39a057170a0d1e5842bd866b1775.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> |