Eric Laurent 4e68d506b0 resolved conflicts for merge of acc4e683 to master ...

Change-Id: Iabfdbdd1f048bd1a3f5cf90bfba8a33f5a0d27f8

2010-08-05 02:53:22 -07:00

..

java/android

resolved conflicts for merge of acc4e683 to master

2010-08-05 02:53:22 -07:00

jni

MTP: Add support for syncing MTP playlists

2010-08-03 15:36:22 -04:00

libdrm

Merge "Modified libdrm to support SuperH platform"

2010-05-14 19:36:40 -07:00

libeffects

am e67332f8: am 92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.

2010-07-30 09:58:09 -07:00

libmedia

resolved conflicts for merge of 27eecb70 to gingerbread

2010-07-30 12:08:31 -07:00

libmediaplayerservice

am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread

2010-08-04 11:12:40 -07:00

libstagefright

am 246aad12: am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread

2010-08-04 11:12:03 -07:00

mediaserver

move native services under services/

2010-07-22 15:28:19 -07:00

mtp

MTP: Add support for syncing MTP playlists

2010-08-03 15:36:22 -04:00

tests

am 9b84e8df: am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread

2010-08-04 11:11:50 -07:00