Mike Lockwood 3864d243a9 Merge changes I93364c74,I5ca831b8 ...

* changes:
  Exclude MTP implementation from simulator build
  Fixes for simulator build on lucid

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

..

java/android

Merge "MtpDatabase: Implement getObjectProperty"

2010-07-14 12:44:41 -07:00

jni

Exclude MTP implementation from simulator build

2010-07-15 15:27:38 -04:00

libdrm

Merge "Modified libdrm to support SuperH platform"

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

libeffects

Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ

2010-07-14 10:09:31 -07:00

libmedia

Fixes for simulator build on lucid

2010-07-15 15:02:52 -04:00

libmediaplayerservice

am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread

2010-07-15 11:54:10 -07:00

libstagefright

Merge changes I93364c74,I5ca831b8

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

mediaserver

move native services under services/

2010-07-14 17:59:35 -07:00

mtp

Exclude MTP implementation from simulator build

2010-07-15 15:27:38 -04:00

tests

am 7b3f3048: am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread

2010-07-07 15:00:22 -07:00