David 'Digit' Turner d615f34b56 Merge "media/mtp: Add missing LOCAL_C_INCLUDES"

2012-01-13 14:32:50 -08:00

..

java/android

MediaScanner: Disable bulk insert for settings

2012-01-11 11:34:20 +09:00

jni

Merge "Use audio_format_t consistently"

2012-01-12 10:30:28 -08:00

libdrm

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

2012-01-03 22:38:27 +00:00

libeffects

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

libmedia

Merge "Use audio_format_t consistently"

2012-01-12 10:30:28 -08:00

libmediaplayerservice

Merge "Use audio_format_t consistently"

2012-01-12 10:30:28 -08:00

libstagefright

am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

2012-01-13 11:28:09 -08:00

mediaserver

Merge "Fix missing tag in mediaserver ServiceManager: log"

2012-01-11 10:22:45 -08:00

mtp

media/mtp: Add missing LOCAL_C_INCLUDES

2012-01-13 14:21:42 +01:00

tests

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00