Merge branch 'tizen' into ckm 74/52974/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 30 Nov 2015 11:57:48 +0000 (12:57 +0100)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 30 Nov 2015 12:01:05 +0000 (13:01 +0100)
commit24f429bb2e002af5c618348aaf955692c30c2cd0
treee86b04aefb1cb2e5ec23e65f86298b867797a334
parent9f28e5460a2d4df1b0b1441a4eb0c448944ba73a
parent86ba2aa7c6e01dd9193e08d01ba1c2f8bfc2d459
Merge branch 'tizen' into ckm

Change-Id: I420a571f81f4abdec743722b0ebac6c128b399d6
src/ckm/capi-testcases.cpp
src/ckm/initial-values.cpp
src/ckm/main.cpp