Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d0da9b4 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolved conflicts for merge of 6052c89f to mnc-dr-dev-plus-aosp 

Change-Id: If44e52b1dad6e5210931452fb160e64c7becbfc7
parents cda7cf7f 6052c89f

media/libmedia/MediaProfiles.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <utils/Log.h>

#include <utils/Vector.h>

#include <cutils/properties.h>

#include <libexpat/expat.h>

#include <expat.h>

#include <media/MediaProfiles.h>

#include <media/stagefright/foundation/ADebug.h>

#include <OMX_Video.h>

media/libstagefright/MediaCodecList.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <utils/threads.h>



#include <cutils/properties.h>

#include <libexpat/expat.h>

#include <expat.h>



namespace android {