Eric Laurent f434fb50a6 resolved conflicts for merge of 79178b8b to master ...

Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65

2011-11-05 08:52:20 -07:00

..

java/android

am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0

2011-10-31 23:23:15 +00: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

resolved conflicts for merge of 79178b8b to master

2011-11-05 08:52:20 -07:00

libmedia

am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0

2011-10-28 02:53:20 +00:00

libmediaplayerservice

am e395f645: Poll input data with a small timeout and don\'t consume a full core.

2011-11-03 18:12:39 +00:00

libstagefright

Properly decode ADTS files with ID3 headers.

2011-11-01 12:09:53 -07:00

mediaserver

…

mtp

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

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

tests

am 1f85f1dc: Merge "Remove unreliable effect tests." into ics-mr1

2011-11-03 15:49:16 +00:00