commit d3463e15be62bc5c4ff1f3b3cd6b6c4e8fd8a4f4
author Tri Vo <trong@google.com> Mon Jun 26 20:35:01 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 26 20:35:03 2017 +0000
tree 4c45634fb4fc2cd5698a17256a90f596b1ac8a5e
parent 84f7e6acb9936708136bd373b212363458381a42
parent da623c4ff0850a60a2bf6769fe85652f8ed25c07

Merge "Rename audio_utils/conversion.h to mono_blend.h"

services/audioflinger/FastMixer.cpp

diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp
index 93f7ce5..4f83c6d 100644
--- a/services/audioflinger/FastMixer.cpp
+++ b/services/audioflinger/FastMixer.cpp
@@ -37,7 +37,7 @@
 #include <cpustats/ThreadCpuUsage.h>
 #endif
 #endif
-#include <audio_utils/conversion.h>
+#include <audio_utils/mono_blend.h>
 #include <audio_utils/format.h>
 #include "AudioMixer.h"
 #include "FastMixer.h"

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 2a29b1b..52c7899 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -36,7 +36,7 @@
 #include <hardware/audio.h>
 #include <audio_effects/effect_ns.h>
 #include <audio_effects/effect_aec.h>
-#include <audio_utils/conversion.h>
+#include <audio_utils/mono_blend.h>
 #include <audio_utils/primitives.h>
 #include <audio_utils/format.h>
 #include <audio_utils/minifloat.h>