Andreas Huber 5b988318a8 Merge "resolved conflicts for merge of 71c908c4 to master"

2010-09-01 15:54:26 -07:00

..

java/android

Merge "MTP: Send an Intent after an MTP session that resulted in media database modifications"

2010-08-31 14:32:39 -07:00

jni

resolved conflicts for merge of 71c908c4 to master

2010-09-01 15:53:26 -07:00

libdrm

Merge "Modified libdrm to support SuperH platform"

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

libeffects

am 55e79374: am f560ceab: Merge "Audio Effects: fix problems in volume control." into gingerbread

2010-08-31 15:49:15 -07:00

libmedia

Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""

2010-09-01 14:32:35 -07:00

libmediaplayerservice

Support for auxiliary video parameters.

2010-09-01 13:46:46 -07:00

libstagefright

Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""

2010-09-01 14:32:35 -07:00

mediaserver

move native services under services/

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

mtp

MTP: Send an Intent after an MTP session that resulted in media database modifications

2010-08-31 16:25:12 -04:00

tests

MTP: Move all MTP protocol constants for Java to a central location.

2010-08-30 13:35:03 -04:00