Merge "[TSAM-3374] Lack of icon of apps in application manager" into tizen

author MyoungJune Park <mj2004.park@samsung.com>

Wed, 25 May 2016 03:08:51 +0000 (20:08 -0700)

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

Wed, 25 May 2016 03:08:51 +0000 (20:08 -0700)
author MyoungJune Park <mj2004.park@samsung.com>
Wed, 25 May 2016 03:08:51 +0000 (20:08 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 25 May 2016 03:08:51 +0000 (20:08 -0700)
diff --cc setting-appmgr/src/setting-appmgr-main.c
Simple merge
diff --cc setting-common/include/setting-common-data-type.h
Simple merge
author	MyoungJune Park <mj2004.park@samsung.com>
	Wed, 25 May 2016 03:08:51 +0000 (20:08 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Wed, 25 May 2016 03:08:51 +0000 (20:08 -0700)
		1	2
setting-appmgr/src/setting-appmgr-main.c	patch \|	diff1 \|	diff2 \|	blob \| history
setting-common/include/setting-common-data-type.h	patch \|	diff1 \|	diff2 \|	blob \| history