Jeff Tinker 665bcd96b7 am a393c2a2: am c884a08e: Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2-dev ...

* commit 'a393c2a2f7a6a3153b82b1e43bfffa1a040d56b5':
  Improve error handling for DRM errors reported by plugins

2013-04-18 16:26:55 -07:00

..

audioeffect

Add liblog

2013-04-09 21:54:12 -07:00

mediaeditor

Add liblog

2013-04-09 21:54:12 -07:00

soundpool

resolved conflicts for merge of a976bddd to master

2013-04-09 23:21:42 -07:00

android_media_AmrInputStream.cpp

…

android_media_MediaCodec.cpp

Add support for common encryption

2013-04-08 14:32:34 -07:00

android_media_MediaCodec.h

…

android_media_MediaCodecList.cpp

…

android_media_MediaCrypto.cpp

…

android_media_MediaCrypto.h

…

android_media_MediaDrm.cpp

Improve error handling for DRM errors reported by plugins

2013-04-17 16:46:49 -07:00

android_media_MediaDrm.h

Implement async event callout from drm plugin to Java app

2013-04-03 12:01:59 -07:00

android_media_MediaExtractor.cpp

Add support for common encryption

2013-04-08 14:32:34 -07:00

android_media_MediaExtractor.h

Add support for common encryption

2013-04-08 14:32:34 -07:00

android_media_MediaMetadataRetriever.cpp

…

android_media_MediaMuxer.cpp

…

android_media_MediaPlayer.cpp

…

android_media_MediaProfiles.cpp

…

android_media_MediaRecorder.cpp

…

android_media_MediaScanner.cpp

…

android_media_ResampleInputStream.cpp

…

android_media_Utils.cpp

…

android_media_Utils.h

…

android_mtp_MtpDatabase.cpp

…

android_mtp_MtpDevice.cpp

…

android_mtp_MtpServer.cpp

…

Android.mk

Add liblog

2013-04-09 21:54:12 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…