Merge branch 'tizen' into cynara 11/32111/1
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 15 Dec 2014 15:46:43 +0000 (16:46 +0100)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 15 Dec 2014 15:49:20 +0000 (16:49 +0100)
commit5672d50ead4dc52eb096688118eb4fe0868d49cc
tree2befd7aedff5c0a07e7b1b002b8d01ec6f631889
parent9509ea04f16b97aab23126b78c4d6d4282aea0bf
parent05c063407fb2c6a1fe9f61d47f80f802e8e37fb1
Merge branch 'tizen' into cynara

Change-Id: I7823ffc2dbd0955045402a32827db459c3083c97
README
packaging/security-tests.spec
tests/common/dbus_access.h
tests/cynara-tests/CMakeLists.txt
tests/framework/include/dpl/test/test_runner.h
tests/framework/src/test_runner.cpp
tests/security-manager-tests/security_manager_tests.cpp