Merge "fix dynamic loading" into tizen

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

Wed, 7 Nov 2018 09:30:52 +0000 (09:30 +0000)

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

Wed, 7 Nov 2018 09:30:52 +0000 (09:30 +0000)
author Wonnam Jang <wn.jang@samsung.com>
Wed, 7 Nov 2018 09:30:52 +0000 (09:30 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 7 Nov 2018 09:30:52 +0000 (09:30 +0000)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/multi_assistant_service.c
Simple merge
author	Wonnam Jang <wn.jang@samsung.com>
	Wed, 7 Nov 2018 09:30:52 +0000 (09:30 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Wed, 7 Nov 2018 09:30:52 +0000 (09:30 +0000)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/multi_assistant_service.c	patch \|	diff1 \|	diff2 \|	blob \| history