Merge "Fix build warning" into tizen

author Wonnam Jang <wn.jang@samsung.com>

Thu, 4 Oct 2018 09:55:46 +0000 (09:55 +0000)

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

Thu, 4 Oct 2018 09:55:46 +0000 (09:55 +0000)
author Wonnam Jang <wn.jang@samsung.com>
Thu, 4 Oct 2018 09:55:46 +0000 (09:55 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 4 Oct 2018 09:55:46 +0000 (09:55 +0000)
diff --cc src/multi_assistant_dbus.c
Simple merge
diff --cc src/multi_assistant_service_plugin.c
Simple merge
author	Wonnam Jang <wn.jang@samsung.com>
	Thu, 4 Oct 2018 09:55:46 +0000 (09:55 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Thu, 4 Oct 2018 09:55:46 +0000 (09:55 +0000)
		1	2
src/multi_assistant_dbus.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/multi_assistant_service_plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history