Glenn Kasten 7b76c8d3fc Merge "Don't crash when parsing DRM MIME types"

2011-02-24 08:17:02 -08:00

..

java/android

Merge "Cleanup for issue 3471160 : video editor calls System.gc"

2011-02-23 09:59:07 -08:00

jni

Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data"

2011-02-23 09:58:33 -08:00

libdrm

Merge "Modified libdrm to support SuperH platform"

2010-05-14 19:36:40 -07:00

libeffects

Bug 3117154

2011-01-25 10:55:35 -08:00

libmedia

Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data"

2011-02-23 09:58:33 -08:00

libmediaplayerservice

To collect the total usage time of encoders in the media recorder

2011-02-23 13:20:21 -08:00

libstagefright

Merge "Don't crash when parsing DRM MIME types"

2011-02-24 08:17:02 -08:00

mediaserver

move native services under services/

2010-07-22 15:28:19 -07:00

mtp

MTP: Add support for dynamically adding and removing storage units

2011-02-22 13:57:23 -08:00

tests

Merge "VideoEditor:IssueID:3396697: Added Performance test code"

2011-02-22 10:56:29 -08:00