Alex Klyubin f271c6d266 resolve merge conflicts of b53d984 to master ...

Change-Id: I3fe63a5c0193c720b8ec4ca53834096de8433f26

2016-12-22 12:00:24 -08:00

..

audioeffect

Merge "Use libaudioclient"

2016-11-07 17:22:36 +00:00

soundpool

Refactor SoundPool for appOps handling through PlayerBase

2016-11-14 09:36:11 -08:00

android_media_ImageReader.cpp

…

android_media_ImageWriter.cpp

…

android_media_MediaCodec.cpp

…

android_media_MediaCodec.h

Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b466935 am: 95311818f0

2016-10-03 20:35:12 +00:00

android_media_MediaCodecList.cpp

…

android_media_MediaCrypto.cpp

…

android_media_MediaCrypto.h

…

android_media_MediaDataSource.cpp

…

android_media_MediaDataSource.h

…

android_media_MediaDrm.cpp

…

android_media_MediaDrm.h

…

android_media_MediaExtractor.cpp

No need to initialize the file sniffers anymore

2016-11-28 19:05:32 +00:00

android_media_MediaExtractor.h

…

android_media_MediaHTTPConnection.cpp

…

android_media_MediaHTTPConnection.h

…

android_media_MediaMetadataRetriever.cpp

…

android_media_MediaMuxer.cpp

…

android_media_MediaPlayer.cpp

MediaPlayer: enable same seek modes as in MediaMetadataRetriever.

2016-12-01 12:32:34 -08:00

android_media_MediaProfiles.cpp

…

android_media_MediaRecorder.cpp

…

android_media_MediaScanner.cpp

…

android_media_MediaSync.cpp

…

android_media_MediaSync.h

…

android_media_PlaybackParams.h

…

android_media_ResampleInputStream.cpp

…

android_media_SyncParams.cpp

…

android_media_SyncParams.h

…

android_media_Utils.cpp

…

android_media_Utils.h

…

android_mtp_MtpDatabase.cpp

…

android_mtp_MtpDevice.cpp

Properly close USB device connection in Mtp device

2016-10-17 11:19:58 -07:00

android_mtp_MtpServer.cpp

Make users of MtpServer fill in DeviceInfo field values

2016-12-21 13:56:28 -08:00

Android.mk

Make AmrInputStream use MediaCodec

2016-11-11 10:53:09 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…