Merge branch 'cynara' into tizen 77/34277/2
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Thu, 22 Jan 2015 14:31:17 +0000 (15:31 +0100)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Thu, 22 Jan 2015 17:21:53 +0000 (18:21 +0100)
commit4f20901f76f8909da0d07f8b5f8f33e8651ea135
tree8f4a2adc20affb4a777d78ca72fd4ab09f6e2e0f
parente3913ef5e08c73c86b3651f0cd3d5cfaf4a67dea
parentf869cf99442da3cdbfd2733aad6644cc4fb9b41a
Merge branch 'cynara' into tizen

Conflicts:
tests/common/dbus_access.cpp
tests/common/dbus_access.h
tests/cynara-tests/common/cynara_test_env.cpp
tests/framework/include/dpl/test/test_runner.h

Change-Id: I91f595f8a92ceafd071c4db0d70f7431447bab48
packaging/security-tests.spec
tests/common/service_manager.cpp
tests/common/service_manager.h
tests/cynara-tests/common/cynara_test_cynara_mask.cpp
tests/cynara-tests/common/cynara_test_cynara_mask.h
tests/cynara-tests/common/cynara_test_env.cpp
tests/cynara-tests/test_cases_async.cpp
tests/cynara-tests/test_cases_db.cpp
tests/framework/include/dpl/test/test_runner.h
tests/framework/src/test_runner.cpp