Merge branch 'tizen' into tizen_line_coverage 55/191355/1
authorSeungbae Shin <seungbae.shin@samsung.com>
Tue, 16 Oct 2018 07:49:56 +0000 (16:49 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Tue, 16 Oct 2018 07:50:21 +0000 (16:50 +0900)
Change-Id: I35670c14b02e01718d77f9c60f8d60d9eb6a5d61

1  2 
src/audio_io.c
src/cpp/CPulseAudioClient.cpp

diff --cc src/audio_io.c
Simple merge
Simple merge