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

Skip to content
Commit e5ac5f84 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

Conflicts:
	media/libmedia/AudioTrack.cpp
	media/libstagefright/ACodec.cpp
	media/libstagefright/MPEG4Extractor.cpp
	media/libstagefright/MPEG4Writer.cpp
	media/libstagefright/TimedEventQueue.cpp
	media/libstagefright/Utils.cpp
	media/libstagefright/matroska/MatroskaExtractor.cpp
	services/audioflinger/Threads.cpp

Change-Id: I027e55d371849ea81db291b37e0b8cc4283d1876
parents af244898 66809dc4
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment