Merge branch 'tizen' into security-manager 66/34766/2
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 2 Feb 2015 14:09:41 +0000 (15:09 +0100)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 2 Feb 2015 16:15:15 +0000 (17:15 +0100)
commit8919d7008177b861cd83099e7e13e40f4188ed03
tree19a51d7df99ab5d3a6f50a15fdd0cbdaa05e9ab8
parent8956650ff14e7d7367206c39d74024b78b4bc842
parent4f20901f76f8909da0d07f8b5f8f33e8651ea135
Merge branch 'tizen' into security-manager

Change-Id: I9f922b5d7269e5020b78f91b726bef444cb1697a
packaging/security-tests.spec
tests/common/CMakeLists.txt
tests/security-manager-tests/security_manager_tests.cpp