Merge branch 'dev_pasdk_govind' into 'dev_pasdk_pp_pasdk69ArmDspCom'
authorChitresh Gupta <chitresh.g@pathpartnertech.com>
Mon, 12 Dec 2016 11:39:08 +0000 (17:09 +0530)
committerChitresh Gupta <chitresh.g@pathpartnertech.com>
Mon, 12 Dec 2016 11:39:08 +0000 (17:09 +0530)
commitc37f5cc7763c211fd1f88471d63b47c59dd7d328
tree741e8f76e59ba17d6f60597f054032dc0fe821dc
parent567f39fe31bb15f5fbb709855e32448fc3dfa3ce
parent9434abd0bfd865fbbdb40caa3d590ef03cc29dcc
Merge branch 'dev_pasdk_govind' into 'dev_pasdk_pp_pasdk69ArmDspCom'

Conflicts:
pasdk/paf
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/test_arm/.cproject
pasdk/test_arm/application/app.cfg
pasdk/test_arm/application/app.cmd
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/app.cfg
pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h