Dirk Dougherty e61cad321d resolved conflicts for merge of 532679a5 to master ...

Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b

2012-03-07 16:58:03 -08:00

..

java/android

Merge "NEW_API: Rework CameraSound into MediaActionSound, and unhide it."

2012-03-07 13:54:43 -08:00

jni

Switch the way we configure for MediaPlayer retransmission.

2012-03-01 14:41:35 -08:00

libaah_rtp

Switch the way we configure for MediaPlayer retransmission.

2012-03-01 14:41:35 -08:00

libdrm

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)

2012-01-19 14:44:50 -08:00

libeffects

Effect for multichannel PCM downmix to stereo

2012-03-07 10:17:19 -08:00

libmedia

IAudioFlingerClient::ioConfigChanged param2 const

2012-03-06 16:43:19 -08:00

libmediaplayerservice

Merge "MediaPlayerService: fix AudioSink latency"

2012-03-06 10:53:39 -08:00

libstagefright

resolved conflicts for merge of 532679a5 to master

2012-03-07 16:58:03 -08:00

mediaserver

Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)

2012-01-19 14:44:56 -08:00

mtp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

tests

am 353b61a8: am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.

2012-03-01 15:35:43 -08:00