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

Commit 8819047d authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Fix libmedia includes." into oc-dev 

am: 005f9e28

Change-Id: Ia6b609e93ed11e24eba0369e59660d8808966e37
parents 67727a84 005f9e28

include/media/AVSyncSettings.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/AVSyncSettings.h
 
 No newline at end of file
 
../../media/libmedia/include/media/AVSyncSettings.h
 
 No newline at end of file

include/media/BufferProviders.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/BufferProviders.h
 
 No newline at end of file
 
../../media/libmedia/include/media/BufferProviders.h
 
 No newline at end of file

include/media/BufferingSettings.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/BufferingSettings.h
 
 No newline at end of file
 
../../media/libmedia/include/media/BufferingSettings.h
 
 No newline at end of file

include/media/CharacterEncodingDetector.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/CharacterEncodingDetector.h
 
 No newline at end of file
 
../../media/libmedia/include/media/CharacterEncodingDetector.h
 
 No newline at end of file

include/media/Crypto.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/Crypto.h
 
 No newline at end of file
 
../../media/libmedia/include/media/Crypto.h
 
 No newline at end of file