Andreas Gampe baa73b056c am cba06c22: resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp ...

* commit 'cba06c2272c8bce7d10b2a7ee762d12043f3252a':
  Frameworks/base: Wall Werror in media/jni

2014-11-11 04:02:22 +00:00

..

audioeffect

resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp

2014-11-10 19:41:52 -08:00

soundpool

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

android_media_AmrInputStream.cpp

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

android_media_ImageReader.cpp

resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp

2014-11-10 19:41:52 -08:00

android_media_MediaCodec.cpp

…

android_media_MediaCodec.h

…

android_media_MediaCodecList.cpp

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

android_media_MediaCrypto.cpp

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

android_media_MediaCrypto.h

…

android_media_MediaDrm.cpp

resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp

2014-11-10 19:41:52 -08:00

android_media_MediaDrm.h

…

android_media_MediaExtractor.cpp

…

android_media_MediaExtractor.h

…

android_media_MediaHTTPConnection.cpp

…

android_media_MediaHTTPConnection.h

…

android_media_MediaMetadataRetriever.cpp

am cba06c22: resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp

2014-11-11 04:02:22 +00:00

android_media_MediaMuxer.cpp

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

android_media_MediaPlayer.cpp

…

android_media_MediaProfiles.cpp

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

android_media_MediaRecorder.cpp

…

android_media_MediaScanner.cpp

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

android_media_ResampleInputStream.cpp

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

android_media_Utils.cpp

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

android_media_Utils.h

…

android_mtp_MtpDatabase.cpp

resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp

2014-11-10 19:41:52 -08:00

android_mtp_MtpDevice.cpp

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

android_mtp_MtpServer.cpp

…

Android.mk

Frameworks/base: Wall Werror in media/jni

2014-11-10 18:19:40 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…