summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-19 06:10:37 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-19 06:10:37 -0800
commit27a0d83f53ddbfd6449ab0e3c786742a2cd135a9 (patch)
tree6bb67bb1bf2d9c069053a98a0a6d6a31bfa2fd02 /media/libmedia
parent241fc78866b2aefd75cd1890df5a75b7008728e8 (diff)
parenta3f1fa308728976fc9ca1b4f37d26e633b32b9ac (diff)
downloadframeworks_av-27a0d83f53ddbfd6449ab0e3c786742a2cd135a9.zip
frameworks_av-27a0d83f53ddbfd6449ab0e3c786742a2cd135a9.tar.gz
frameworks_av-27a0d83f53ddbfd6449ab0e3c786742a2cd135a9.tar.bz2
Merge "Fix incorrect includes of AudioTrack.h"
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/mediaplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index acf97a6..f1c47dd 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -30,7 +30,7 @@
#include <gui/SurfaceTextureClient.h>
#include <media/mediaplayer.h>
-#include <media/AudioTrack.h>
+#include <media/AudioSystem.h>
#include <surfaceflinger/Surface.h>