| commit | 574d7be550cd6475d1b24f8fac5e73c8292cd3cc | [log] [tgz] |
|---|---|---|
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | Fri Dec 06 02:42:19 2013 +0000 |
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | Fri Dec 06 02:42:19 2013 +0000 |
| tree | a39eb1eff7d08f9c0b7ba8bbdd33e9903ffecfcb | |
| parent | b5d257e31e992e428f20a43f4cdcde0fa7fb72f8 [diff] | |
| parent | 126a630374323c18cda87cca66e8ed740fb5c54b [diff] |
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