Merge branch 'tizen' into security-manager 66/88366/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Fri, 16 Sep 2016 12:13:07 +0000 (14:13 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Fri, 16 Sep 2016 12:20:13 +0000 (14:20 +0200)
commit55859d0ed339ac30ae14780b1d1940bcea986834
tree1891264d97d26ab4d4ae23025d9a25bd062cf957
parent207aac1a37394c8883b4f42cd1a77413a860ac4e
parentff54c892d3d4f4facffebaa6fdb5cdc569ba0ade
Merge branch 'tizen' into security-manager

Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>
Conflicts:
src/common/tests_common.cpp
src/common/tests_common.h

Change-Id: Ic2301d3414aad2be4488eb04c59e217e184037ca
packaging/security-tests.spec
src/common/tests_common.cpp
src/common/tests_common.h