Merge branch 'tizen' into security-manager 09/32109/1
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 15 Dec 2014 15:38:01 +0000 (16:38 +0100)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 15 Dec 2014 15:39:32 +0000 (16:39 +0100)
commite0782175542f0384ebc59c96e9f2609d96bc6676
tree85e096f2d2f040552c465a628966c4b9a2a4480a
parent0de26accaa7a87e7947a3bc589f16c745fd18702
parent05c063407fb2c6a1fe9f61d47f80f802e8e37fb1
Merge branch 'tizen' into security-manager

Change-Id: I0a590a3616c34fd61024dc353c799f6c83d1846b
tests/security-manager-tests/security_manager_tests.cpp