James Dong 0be123918e am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2 ...

* commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a':
  Revert "Use pread() to get the decrypted data for container based DRM file."

2011-05-26 11:41:30 -07:00

..

java/android

Merge "For out of band timed text support (timed text in a separate file)."

2011-05-25 20:11:25 -07: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 mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.

2011-05-25 15:57:07 -07:00

libstagefright

am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2

2011-05-26 11:41:30 -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