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

Commit 2cf3340d authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolved conflicts for merge of c51e512a to lmp-mr1-dev-plus-aosp 

Change-Id: I281f72a222fccd7eb663b878a8c717b3f95baddd
parents 9b68037c c51e512a

media/libstagefright/timedtext/TimedTextPlayer.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


namespace android {



class AMessage;

struct AMessage;

class MediaPlayerBase;

class TimedTextDriver;

class TimedTextSource;

media/libstagefright/timedtext/TimedTextSRTSource.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


namespace android {



class AString;

struct AString;

class DataSource;

class MediaBuffer;

class Parcel;