merge foram tag exdroid4.1.1_r1-a10-v0.4release

Conflicts:
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/Android.mk
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/collect_libs.sh
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libGetAudio_format.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libaac.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libaacenc.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libac3.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libac3_hw.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libac3_raw.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libamr.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libape.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libatrc.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libaw_audio.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libaw_audioa.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libawts_muxer.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedara_decoder.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarv.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarv_adapter.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarv_base.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarx_rtsp.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarxalloc.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarxbase.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarxcomponents.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarxdemuxers.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarxosal.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarxplayer.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarxrender.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarxsftdemux.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarxstream.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcedarxwvmdemux.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libcook.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_asf.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_avi.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_awts.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_cedarm.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_flv.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_idxsub.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_mkv.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_mov.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_mpg.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_ogg.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_pmp.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_rmvb.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdemux_ts.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdts.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdts_hw.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libdts_raw.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libfacedetection.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libflac.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libh264enc.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libiconv.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libjpgenc.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libm3u.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libmp3.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libmp4_muxer.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libmuxers.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libogg.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libosal.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libra.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libraw_muxer.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libsipr.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libstagefright_httplive_opt.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libstagefright_soft_cedar_h264dec.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libstream.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libsub.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libsub_inline.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libsubrender.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libswdrm.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libthirdpartstream.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libuserdemux.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libve.so
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libwav.a
	media/CedarX-Projects/CedarAndroidLib/LIB_JB_F23/libwma.a
	media/CedarX-Projects/CedarX/include/CDX_Common.h
	media/CedarX-Projects/CedarX/include/CDX_PlayerAPI.h
	media/CedarX-Projects/CedarX/include/include_camera/type_camera.h
	media/CedarX-Projects/CedarX/include/include_omx/OMX_Index.h
	media/CedarX-Projects/CedarX/include/include_stream/cedarx_stream.h
	media/CedarX-Projects/CedarX/libthirdpartdev/Android.mk
	media/CedarX-Projects/CedarX/libthirdpartdev/thirdpart_stream.c
	media/CedarX-Projects/CedarXAndroid/IceCreamSandwich/Android.mk
	media/CedarX-Projects/CedarXAndroid/IceCreamSandwich/CedarXAudioPlayer.cpp
	media/CedarX-Projects/CedarXAndroid/IceCreamSandwich/CedarXNativeRenderer.cpp
	media/CedarX-Projects/CedarXAndroid/IceCreamSandwich/CedarXNativeRenderer.h
	media/CedarX-Projects/CedarXAndroid/IceCreamSandwich/CedarXPlayer.cpp
	media/CedarX-Projects/CedarXAndroid/IceCreamSandwich/CedarXPlayer.h
	media/CedarX-Projects/CedarXAndroid/IceCreamSandwich/CedarXRecorder.cpp
	media/CedarX-Projects/CedarXAndroid/IceCreamSandwich/CedarXRecorder.h
	media/CedarX-Projects/Config.mk