Merge branch 'ckm' into tizen 60/223060/1
authorDariusz Michaluk <d.michaluk@samsung.com>
Wed, 22 Jan 2020 12:17:02 +0000 (13:17 +0100)
committerDariusz Michaluk <d.michaluk@samsung.com>
Wed, 22 Jan 2020 12:17:02 +0000 (13:17 +0100)
Change-Id: Iac9d5cc6393e8598a33c783aabff77006046b187

1  2 
CMakeLists.txt
src/ckm/unprivileged/main.cpp

diff --cc CMakeLists.txt
Simple merge
Simple merge