strict-aliasing fix
	modified:   legacy/alsa_sound/Android.mk
Merge remote-tracking branch 'cm/cm-11.0' into kitkat
Merge remote-tracking branch 'cm/cm-11.0' into kitkat
Merge remote-tracking branch 'cm/cm-11.0' into kitkat
legacy/msm8660: fix VoIP in call audio transmission

 Forward port fix from CM10.2

 - In VoIp call mute option is not working
 - Due to wrong device selection, PCM recording path is selected, instead
   of MVS Tx path, for VoIP tx.
 - Enable MVS Tx path for VoIP uplink.
 - Add verification for available input device
 - Updated audio policy to add IN_COMMUNICATION global config

Change-Id: Idf00768e56bd872a1cc82c6aa05448421dd3f246
Merge branch 'kk_2.7_rb1.17' of git://codeaurora.org/platform/hardware/qcom/audio into cm-11.0
msm8660: Kill crazy logspam

Change-Id: If725ba813dd88d71771da280d2bc2be04db117e4
Merge branch 'kk_3.5_rb1.16' of git://codeaurora.org/platform/hardware/qcom/audio into cm-11.0

Change-Id: I94f09e31488feeb339f95a10d3f8fa7312c9891e
hal: Compilation fixes

 * Properly include path to kernel headers for postproc effects
 * Don't try to build SSR or Listen if QC_PROP_ROOT isn't set

Change-Id: I8f2a874bbbec09cea8eae423a82e6cc59d03f422
Merge remote-tracking branch 'cm/cm-11.0' into kitkat

Conflicts:
	hal/audio_extn/audio_extn.c
	hal/audio_extn/hfp.c
	hal/msm8974/platform.c
	hal/msm8974/platform.h
	hal/voice.c
	hal_mpq/Android.mk
	hal_mpq/audio_bitstream_sm.c
	hal_mpq/audio_hw.h
	hal_mpq/audio_stream_out.c
	hal_mpq/mpq8092/hw_info.c
	hal_mpq/mpq8092/platform.c
	hal_mpq/mpq8092/platform.h
	hal_mpq/platform_api.h
Merge remote-tracking branch 'upstream/cm-11.0' into kitkat
no-strict-aliasing error
	modified:   visualizer/Android.mk
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_hardware_qcom_audio-caf into HEAD
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_hardware_qcom_audio-caf into HEAD
Merge remote-tracking branch 'upstream/cm-11.0' into kitkat
Merge remote-tracking branch 'upstream/cm-11.0' into kitkat
Merge remote-tracking branch 'cm/cm-11.0'; commit 'HEAD' into HEAD
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_hardware_qcom_audio-caf into HEAD
hal: Add speaker backend case handling

* Some devices route their speakers through a different backend. Allow
  speaker use cases to be routed separately in this case.

Change-Id: I6bcaa4a0b72d2fc60ae02d4f49cfca0fdb55405f
Merge remote-tracking branch 'upstream/kitkat' into vaosp