Merge "Fixed minor issues" into tizen

author jusung son <jusung07.son@samsung.com>

Fri, 18 Aug 2017 00:24:18 +0000 (00:24 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Fri, 18 Aug 2017 00:24:18 +0000 (00:24 +0000)
author jusung son <jusung07.son@samsung.com>
Fri, 18 Aug 2017 00:24:18 +0000 (00:24 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 18 Aug 2017 00:24:18 +0000 (00:24 +0000)
diff --cc src/data_control_internal.c
Simple merge
diff --cc src/data_control_provider.c
Simple merge
author	jusung son <jusung07.son@samsung.com>
	Fri, 18 Aug 2017 00:24:18 +0000 (00:24 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Fri, 18 Aug 2017 00:24:18 +0000 (00:24 +0000)
		1	2
src/data_control_internal.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/data_control_provider.c	patch \|	diff1 \|	diff2 \|	blob \| history