Andreas Huber 3dc44d9afe am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 ...

* commit '8a0654231ff36d938bc3451190cf67231195f1d0':
  Didn't mean to check this in...

2011-11-11 11:51:17 -08:00

..

java/android

Add support for retrieving location information in mp4/3gpp files

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

jni

am f51f1bd9: Verify we actually have valid utf8 metadata

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

libdrm

Tidy up exception throwing in the media native code.

2011-04-08 17:42:34 -07:00

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

resolved conflicts for merge of 26f70db9 to master

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

libmediaplayerservice

am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0

2011-11-09 21:19:00 +00:00

libstagefright

am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1

2011-11-11 11:51:17 -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