Andreas Huber f6bd4369fd resolved conflicts for merge of 1fc97385 to master ...

Change-Id: I9b1fb673844eb822313067d3be16b6c1ce1f2ccb

2010-09-17 15:35:59 -07:00

..

java/android

Merge "Adding default profiles for specific levels."

2010-09-17 13:54:55 -07:00

jni

Media scanner support for tracking files of arbitrary type.

2010-09-12 23:21:44 -04:00

libdrm

Merge "Modified libdrm to support SuperH platform"

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

libeffects

am d32d3011: am 37de5da0: Merge "Fix problem in lvm effect bundle wrapper" into gingerbread

2010-09-16 10:56:25 -07:00

libmedia

Adding default profiles for specific levels.

2010-09-17 13:19:13 -07:00

libmediaplayerservice

Implemented frequent read returns for quick stop in time lapse.

2010-09-17 09:50:27 -07:00

libstagefright

resolved conflicts for merge of 1fc97385 to master

2010-09-17 15:35:59 -07:00

mediaserver

move native services under services/

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

mtp

MTP: Delete all files and subdirectories when deleting directories.

2010-09-14 10:37:27 -04:00

tests

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

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