Mike Lockwood e6f3f54e05 resolved conflicts for merge of b107f4de to master ...

Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e

2011-05-16 16:08:12 -04:00

..

audioeffect

Fix issue 3509396: AudioEffect.getParameter JAVA.

2011-03-21 17:11:59 -07:00

mediaeditor

Fix for issue 3385135 "source code cleanup" engine part

2011-04-22 11:46:10 -07:00

soundpool

update for new audio.h header location

2011-05-12 14:09:57 -07:00

android_media_AmrInputStream.cpp

Tidy up exception throwing in the media native code.

2011-04-08 17:42:34 -07:00

android_media_MediaMetadataRetriever.cpp

Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI

2011-05-05 15:11:23 -07:00

android_media_MediaPlayer.cpp

Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI

2011-05-05 15:11:23 -07:00

android_media_MediaProfiles.cpp

…

android_media_MediaRecorder.cpp

update for new audio.h header location

2011-05-12 14:09:57 -07:00

android_media_MediaScanner.cpp

DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider

2011-05-03 21:03:56 -04:00

android_media_ResampleInputStream.cpp

Tidy up exception throwing in the media native code.

2011-04-08 17:42:34 -07:00

android_media_Utils.cpp

Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI

2011-05-05 15:11:23 -07:00

android_media_Utils.h

Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI

2011-05-05 15:11:23 -07:00

android_mtp_MtpDatabase.cpp

DO NOT MERGE MTP: Implement GetThumb command

2011-05-03 21:03:57 -04:00

android_mtp_MtpDevice.cpp

Handle the failure from GetStringUTFChars()

2011-04-06 12:05:03 -07:00

android_mtp_MtpServer.cpp

resolved conflicts for merge of b107f4de to master

2011-05-16 16:08:12 -04:00

Android.mk

Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI

2011-05-05 15:11:23 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…