Merge branch 'cynara' into tizen 57/49157/1
authorOskar Świtalski <o.switalski@samsung.com>
Thu, 1 Oct 2015 06:44:58 +0000 (08:44 +0200)
committerOskar Świtalski <o.switalski@samsung.com>
Wed, 7 Oct 2015 06:14:40 +0000 (08:14 +0200)
commit608d01b21506b4e3004d157b8b7ca63be98cc22b
tree599438577f86f09fb454aae61934dd9dd5c81914
parent2f15b2770175956fe214b395ca1293aa6ec4f279
parent5c4e00214631dfdc7716a5448f1c2a6d86f1fcbb
Merge branch 'cynara' into tizen

Change-Id: I115ec35a71d6f2a08f2dc08bbc6b63e0b0156e50
packaging/security-tests.spec
src/security-manager-tests/CMakeLists.txt