summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2015-02-19 17:11:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-19 17:11:34 +0000
commitc1b3bc0ced3b7526c31223911d334961ae031995 (patch)
tree595a4add001bb265f287dae9f3bd902787f2cc94 /media
parent1fb8290c1f99e1db96b681e6eaae0193ea81674e (diff)
parent56ec4ffcbae8aeac6c5245fc7b825d02e2e6cefd (diff)
downloadframeworks_av-c1b3bc0ced3b7526c31223911d334961ae031995.zip
frameworks_av-c1b3bc0ced3b7526c31223911d334961ae031995.tar.gz
frameworks_av-c1b3bc0ced3b7526c31223911d334961ae031995.tar.bz2
Merge "Refactor AudioPolicyManager"
Diffstat (limited to 'media')
-rw-r--r--media/mediaserver/main_mediaserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index af1c9e6..263dd32 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -33,7 +33,7 @@
#include "CameraService.h"
#include "MediaLogService.h"
#include "MediaPlayerService.h"
-#include "AudioPolicyService.h"
+#include "service/AudioPolicyService.h"
#include "SoundTriggerHwService.h"
using namespace android;