Merge "Integration with security-manager" into tizen

author Sangyoon Jang <s89.jang@samsung.com>

Wed, 29 Apr 2015 08:49:20 +0000 (01:49 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Wed, 29 Apr 2015 08:49:20 +0000 (01:49 -0700)
author Sangyoon Jang <s89.jang@samsung.com>
Wed, 29 Apr 2015 08:49:20 +0000 (01:49 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 29 Apr 2015 08:49:20 +0000 (01:49 -0700)
diff --cc include/menu_db_util.h
Simple merge
diff --cc packaging/aul.spec
Simple merge
author	Sangyoon Jang <s89.jang@samsung.com>
	Wed, 29 Apr 2015 08:49:20 +0000 (01:49 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Wed, 29 Apr 2015 08:49:20 +0000 (01:49 -0700)
		1	2
include/menu_db_util.h	patch \|	diff1 \|	diff2 \|	blob \| history
packaging/aul.spec	patch \|	diff1 \|	diff2 \|	blob \| history