Andreas Huber db85b54395 resolved conflicts for merge of 3d630e86 to master ...

Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e

2011-11-30 09:53:40 -08:00

..

java/android

am 4d592c59: am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue

2011-11-22 13:22:00 -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

am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1

2011-11-29 16:33:02 -08:00

libmediaplayerservice

resolved conflicts for merge of 3d630e86 to master

2011-11-30 09:53:40 -08:00

libstagefright

Fix the broken build

2011-11-29 18:00:03 -08:00

mediaserver

…

mtp

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

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

tests

am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1

2011-11-28 19:57:26 -08:00