Andreas Huber b003ad17bf am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo ...

Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp

* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
  Support for customizable socket-read timeouts through the HTTP response.

2010-05-12 07:49:39 -07:00

..

java/android

am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo

2010-05-12 07:49:10 -07:00

jni

Use local lock for most MediaMetadataRetriever methods. Bug 2560834.

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

libdrm

donut snapshot

2009-08-31 09:17:57 -07:00

libmedia

Use local lock for most MediaMetadataRetriever methods. Bug 2560834.

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

libmediaplayerservice

Disable vorbis seek when streaming from localhost.

2010-05-06 10:31:57 -07:00

libstagefright

Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo

2010-05-11 12:21:14 -07:00

mediaserver

Fix issue 1795088 Improve audio routing code

2009-07-23 06:03:39 -07:00

tests

Remove the checkStremingServer checking as it is unstable and introduce the flakiness.

2010-04-09 13:53:56 -07:00