From: Zbigniew Jasinski <z.jasinski@samsung.com>
Date: Mon, 29 Feb 2016 11:16:50 +0000 (+0100)
Subject: Merge branch 'tizen' into cynara
X-Git-Tag: security-manager_5.5_testing~7^4~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2bb6e45b7ee73708a2500dc5d8353850531df5a1;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

Merge branch 'tizen' into cynara

Conflicts:
	src/security-server-tests/security_server_tests_password.cpp

Change-Id: I753ad499c1bf64330fc0af352e7468c13539c752
---

2bb6e45b7ee73708a2500dc5d8353850531df5a1