commit 1e039394f351ef77592689f32294a1c73840ad0e
author Glenn Kasten <gkasten@google.com> Mon Mar 13 16:34:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 13 16:34:23 2017 +0000
tree 551c0992185c35afed61e1e9dfeecee98756a7a3
parent 00bf9d385f4dbfd11debd89b9fe7d5547aea5956
parent 6bf707f4c0752643757a7389384817da41d34fab

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 7182f32..103e7f8 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 <media/AudioMixer.h>
 #include "FastMixer.h"

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 14ff6ee..fb1428e 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -36,7 +36,7 @@
 
 #include <private/media/AudioTrackShared.h>
 #include <private/android_filesystem_config.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>