Andreas Huber aa25761114 am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 ...

* commit '624efe45671131903fb5165f6133ba39486092ab':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...

2011-11-17 13:20:16 -08:00

..

java/android

am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1

2011-11-15 20:19:55 -08:00

jni

am f51f1bd9: Verify we actually have valid utf8 metadata

2011-11-03 20:18:37 +00:00

libdrm

…

libeffects

am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1

2011-11-11 11:51:14 -08:00

libmedia

Merge "JetPlayer uses C++ Thread not createThreadEtc"

2011-11-17 07:14:29 -08:00

libmediaplayerservice

MidiFile uses C++ Thread not createThreadEtc

2011-11-16 15:43:31 -08:00

libstagefright

am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1

2011-11-17 13:20:16 -08:00

mediaserver

…

mtp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

2011-10-26 09:57:54 +01:00

tests

resolved conflicts for merge of 26f70db9 to master

2011-11-08 10:40:20 -08:00