James Dong 03466e35f2 Merge "Adds handler type 'sbtl' to support subtitles in various containers."

2011-11-10 16:14:56 -08:00

..

java/android

Fix problems in tablet silent mode.

2011-11-09 18:06: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 "Adds handler type 'sbtl' to support subtitles in various containers."

2011-11-10 16:14:56 -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