Merge tag 'android-4.4.1_r1' into HEAD
Android 4.4.1 Release 1 Conflicts: media/libmediaplayerservice/StagefrightRecorder.cpp media/libstagefright/AudioSource.cpp media/libstagefright/AwesomePlayer.cpp media/libstagefright/DataSource.cpp media/libstagefright/OMXCodec.cpp services/audioflinger/RecordTracks.h services/audioflinger/Threads.cpp services/audioflinger/Threads.h services/audioflinger/Tracks.cpp Change-Id: Ie17f9030275faae7a0f907b8ccc3195a7657742d
Loading
Please register or sign in to comment