Merge remote-tracking branch 'origin/dev_psdkaudio_qin_astsplit' into dev_psdkaudio_frank
authorFrank Livingston <frank-livingston@ti.com>
Fri, 12 Aug 2016 23:17:16 +0000 (18:17 -0500)
committerFrank Livingston <frank-livingston@ti.com>
Fri, 12 Aug 2016 23:17:16 +0000 (18:17 -0500)
commit5278c746a1c4d2c76a5c28ca00339bb8d005a27b
tree8b50e96a7e0a5fb86a6713090f06acfded66b670
parentfe04fd3f502b0daf856a1a93b387b04a2ac3b654
parentf030d92010027ba2bf180882054de8ef85356d81
Merge remote-tracking branch 'origin/dev_psdkaudio_qin_astsplit' into dev_psdkaudio_frank

Conflicts:
readme_demo.txt
procsdk_audio_x_xx_xx_xx/test_arm/.cproject
procsdk_audio_x_xx_xx_xx/test_arm/framework/audioStreamDecodeProc.c
procsdk_audio_x_xx_xx_xx/test_dsp/application/itopo/evmk2g/io.c
procsdk_audio_x_xx_xx_xx/test_dsp/framework/audioStreamInpProc.c
readme_demo.txt