Merge branch 'tizen' into cynara 81/48881/1
authorOskar Świtalski <o.switalski@samsung.com>
Thu, 1 Oct 2015 06:44:58 +0000 (08:44 +0200)
committerOskar Świtalski <o.switalski@samsung.com>
Thu, 1 Oct 2015 06:50:35 +0000 (08:50 +0200)
commit5121311c414eb720008587436acc2c6497b778d3
tree599438577f86f09fb454aae61934dd9dd5c81914
parent2f15b2770175956fe214b395ca1293aa6ec4f279
parent5c4e00214631dfdc7716a5448f1c2a6d86f1fcbb
Merge branch 'tizen' into cynara

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