Andreas Huber 3c452e3660 am f28e0c2a: Merge change I9a50fdf4 into eclair-mr2 ...

Merge commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6' into eclair-mr2-plus-aosp

* commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6':
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.

2009-11-06 11:35:57 -08:00

..

java/android

am d512a3b3: Merge change Ic1d72f56 into eclair-mr2

2009-11-05 20:12:50 -08:00

jni

Music visualizer support hack.

2009-10-06 08:51:16 -07:00

libdrm

donut snapshot

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

libmedia

DO NOT MERGE: Squashed commit of the following:

2009-11-05 13:06:17 -08:00

libmediaplayerservice

DO NOT MERGE: Squashed commit of the following:

2009-11-05 13:06:17 -08:00

libstagefright

Merge change I9a50fdf4 into eclair-mr2

2009-11-06 14:25:26 -05:00

mediaserver

Fix issue 1795088 Improve audio routing code

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

sdutils

donut snapshot

2009-07-29 14:25:07 -07:00

tests

am 1e495da1: Merge change I4b03c2cd into eclair

2009-11-05 19:09:58 -08:00