Gloria Wang 8f7a0275f2 am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp ...

* commit 'cf393faaa871333496a63c13196fdbc0f2bd9118':
  - Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.

2010-11-03 10:59:23 -07:00

..

java/android

Merge "Use SoftReference for WaveformData"

2010-11-02 20:26:22 -07:00

jni

Squashed commit of the following:

2010-10-29 13:20:06 -07:00

libdrm

Merge "Modified libdrm to support SuperH platform"

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

libeffects

am cd08ada7: am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread

2010-10-27 11:11:19 -07:00

libmedia

Squashed commit of the following:

2010-10-29 13:20:06 -07:00

libmediaplayerservice

Squashed commit of the following:

2010-10-29 13:20:06 -07:00

libstagefright

am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp

2010-11-03 10:59:23 -07:00

mediaserver

move native services under services/

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

mtp

MTP: Include size of 12 byte header in packet size for GetObject data packet

2010-10-11 17:33:52 -04:00

tests

am 751cc424: am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread

2010-10-27 11:58:58 -07:00