Merge remote-tracking branch 'tizen/security-manager' into appdefined

author Bartlomiej Grzelewski <b.grzelewski@samsung.com>

Mon, 24 Apr 2017 16:20:32 +0000 (18:20 +0200)

committer Bartlomiej Grzelewski <b.grzelewski@samsung.com>

Mon, 24 Apr 2017 16:49:36 +0000 (18:49 +0200)
author Bartlomiej Grzelewski <b.grzelewski@samsung.com>
Mon, 24 Apr 2017 16:20:32 +0000 (18:20 +0200)
committer Bartlomiej Grzelewski <b.grzelewski@samsung.com>
Mon, 24 Apr 2017 16:49:36 +0000 (18:49 +0200)
diff --cc src/security-manager-tests/common/scoped_installer.h
Simple merge
diff --cc src/security-manager-tests/test_cases.cpp
Simple merge
author	Bartlomiej Grzelewski <b.grzelewski@samsung.com>
	Mon, 24 Apr 2017 16:20:32 +0000 (18:20 +0200)
committer	Bartlomiej Grzelewski <b.grzelewski@samsung.com>
	Mon, 24 Apr 2017 16:49:36 +0000 (18:49 +0200)
		1	2
src/security-manager-tests/common/scoped_installer.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/security-manager-tests/test_cases.cpp	patch \|	diff1 \|	diff2 \|	blob \| history