Andreas Huber b516b96d88 Merge "Instead of asserting, remove active streams if their sockets return failure"

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

..

java/android

Fix 5509346: Resize the thumbnails if it's too large.

2011-11-07 20:34:37 +08:00

jni

am f51f1bd9: Verify we actually have valid utf8 metadata

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

libdrm

…

libeffects

resolved conflicts for merge of 914972be to master

2011-11-05 09:32:35 -07: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

Merge "Instead of asserting, remove active streams if their sockets return failure"

2011-11-09 14:47:51 -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