Mike Lockwood e6f3f54e05 resolved conflicts for merge of b107f4de to master ...

Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e

2011-05-16 16:08:12 -04:00

..

java/android

resolved conflicts for merge of b107f4de to master

2011-05-16 16:08:12 -04:00

jni

resolved conflicts for merge of b107f4de to master

2011-05-16 16:08:12 -04:00

libdrm

Tidy up exception throwing in the media native code.

2011-04-08 17:42:34 -07:00

libeffects

frameworks/base: remove LOCAL_PRELINK_MODULE

2011-03-14 14:25:59 -07:00

libmedia

Merge "Add support for platform-specific recording start time offset"

2011-05-13 16:31:10 -07:00

libmediaplayerservice

Support platform and camera dependent recording start time offset

2011-05-14 07:18:43 -07:00

libstagefright

Merge "Fix module tags on stagefright software decoders."

2011-05-16 10:47:50 -07:00

mediaserver

move native services under services/

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

mtp

MTP: Have GetStorageInfo command return correct storage type for removable storage

2011-05-16 14:29:45 -04:00

tests

Add setParameter/getParameter to MediaPlayer API.

2011-04-29 10:24:03 -07:00