Eric Laurent bb7684bafa resolved conflicts for merge of ac4a284a to master ...

Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8

2010-09-23 12:22:44 -07:00

..

audioeffect

Fix issue 3022800.

2010-09-23 11:04:03 -07:00

soundpool

…

android_media_AmrInputStream.cpp

…

android_media_MediaMetadataRetriever.cpp

…

android_media_MediaPlayer.cpp

resolved conflicts for merge of 71c908c4 to master

2010-09-01 15:53:26 -07:00

android_media_MediaProfiles.cpp

Adding hasProfile.

2010-09-10 14:22:11 -07:00

android_media_MediaRecorder.cpp

am 2432248b: am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread

2010-09-10 11:34:15 -07:00

android_media_MediaScanner.cpp

Media scanner support for tracking files of arbitrary type.

2010-09-12 23:21:44 -04:00

android_media_MtpClient.cpp

MTP host: Use Java longs for storage and object IDs

2010-09-21 10:41:33 -04:00

android_media_MtpCursor.cpp

MTP host: Use Java longs for storage and object IDs

2010-09-21 10:41:33 -04:00

android_media_MtpDatabase.cpp

MTP: Implement support for getting/setting device properties

2010-09-02 14:59:26 -04:00

android_media_MtpServer.cpp

MTP: try to fix sim build

2010-09-02 09:58:48 -04:00

android_media_ResampleInputStream.cpp

…

Android.mk

resolved conflicts for merge of 71c908c4 to master

2010-09-01 15:53:26 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…