James Dong f53453d596 Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."

2011-11-22 17:36:45 -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

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

am d4b22ab4: status_t != bool

2011-11-18 15:07:21 -08:00

libmediaplayerservice

MidiFile uses C++ Thread not createThreadEtc

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

libstagefright

Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."

2011-11-22 17:36:45 -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