Merge branch 'tizen' into security-manager 52/66752/2
authorZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 20 Apr 2016 15:47:31 +0000 (17:47 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 20 Apr 2016 15:47:59 +0000 (17:47 +0200)
commit261fbff8bd9d0a57e23cc2ec648d486cddbffcd7
tree9553a73c093e0a56eeb7902f07df1353f1484c90
parent959178f77631e65d8fbb6f79f646ca46461e57a6
parent4b2a3c0ebe21b70c2c3d6a22b091210b4011e365
Merge branch 'tizen' into security-manager

Change-Id: I7ac3279e0d1cc56ee8c327af381dca9a303a3026
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>
src/security-manager-tests/security_manager_tests.cpp