James Dong a94e11429a am 39e876ad: Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo ...

Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp

* commit '39e876ad743f203fe005333947c61383772b0d14':
  When filling the cache, we always time out waiting for a condition that won't occur.

2010-06-17 12:23:48 -07:00

..

java/android

am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo

2010-06-03 11:27:19 -07:00

jni

Use local lock for most MediaMetadataRetriever methods. Bug 2560834.

2010-04-01 18:08:22 -07:00

libdrm

Merge "Modified libdrm to support SuperH platform"

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

libmedia

Use local lock for most MediaMetadataRetriever methods. Bug 2560834.

2010-04-01 18:08:22 -07:00

libmediaplayerservice

merge from open-source master

2010-05-14 09:44:36 -07:00

libstagefright

Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo

2010-06-16 16:10:52 -07:00

mediaserver

…

tests

Added the runtime parameters for the mediarecorder stress test.

2010-05-25 16:42:57 -07:00