summaryrefslogtreecommitdiffstats
path: root/media/libmedia/MediaProfiles.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-09-09 16:11:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-09 16:11:37 -0700
commitfd48021dfc3278b048ba99ecffe7f996751fb440 (patch)
tree95df204b201380b95ae273ab9788d81fce8e3f62 /media/libmedia/MediaProfiles.cpp
parent6ce3d19cd35a49add6893298f70b87917fc60d52 (diff)
parente7c992c675e0075cd60b0b11c06d5956e3ddd7a3 (diff)
downloadframeworks_av-fd48021dfc3278b048ba99ecffe7f996751fb440.zip
frameworks_av-fd48021dfc3278b048ba99ecffe7f996751fb440.tar.gz
frameworks_av-fd48021dfc3278b048ba99ecffe7f996751fb440.tar.bz2
am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
* commit 'e7c992c675e0075cd60b0b11c06d5956e3ddd7a3': Fix libmedia and libstagefright to get expat header files from the approved location.
Diffstat (limited to 'media/libmedia/MediaProfiles.cpp')
-rw-r--r--media/libmedia/MediaProfiles.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp
index 84bc7a7..48bbf8f 100644
--- a/media/libmedia/MediaProfiles.cpp
+++ b/media/libmedia/MediaProfiles.cpp
@@ -23,7 +23,7 @@
#include <utils/Log.h>
#include <utils/Vector.h>
#include <cutils/properties.h>
-#include <expat.h>
+#include <libexpat/expat.h>
#include <media/MediaProfiles.h>
#include <media/stagefright/foundation/ADebug.h>
#include <OMX_Video.h>