Elliott Hughes b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master ...

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0

2015-09-24 10:01:32 -07:00

..

audioeffect

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

soundpool

…

android_media_AmrInputStream.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_media_ImageReader.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_ImageWriter.cpp

…

android_media_MediaCodec.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaCodec.h

…

android_media_MediaCodecList.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaCrypto.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaCrypto.h

…

android_media_MediaDataSource.cpp

…

android_media_MediaDataSource.h

…

android_media_MediaDrm.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaDrm.h

…

android_media_MediaExtractor.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaExtractor.h

…

android_media_MediaHTTPConnection.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaHTTPConnection.h

…

android_media_MediaMetadataRetriever.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaMuxer.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_media_MediaPlayer.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaProfiles.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_media_MediaRecorder.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaScanner.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_media_MediaSync.cpp

MediaSync: fix flush handling and deadlock

2015-07-16 17:09:20 -07:00

android_media_MediaSync.h

MediaSync: fix flush handling and deadlock

2015-07-16 17:09:20 -07:00

android_media_PlaybackParams.h

…

android_media_ResampleInputStream.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_media_SyncParams.cpp

…

android_media_SyncParams.h

…

android_media_Utils.cpp

…

android_media_Utils.h

…

android_mtp_MtpDatabase.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_mtp_MtpDevice.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_mtp_MtpServer.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

Android.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…