Andreas Huber 3f15301c06 am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread ...

Merge commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f'

* commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f':
  Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.

2010-07-20 09:33:09 -07:00

..

java/android

Add MTP_OBJECT_ID column name to MediaStore.MediaColumns

2010-07-19 09:51:56 -04: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

Merge "Fix sim-eng build."

2010-07-19 11:27:08 -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

am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread

2010-07-20 09:33:09 -07:00

mediaserver

move native services under services/

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

mtp

Merge "MTP host fixes:"

2010-07-20 09:06:41 -07: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