Merge "[CONPRO-1473] Fix for build error [-Werror=implicit-function-declaration]...

author Pyun DoHyun <dh79.pyun@samsung.com>

Mon, 26 Aug 2019 23:45:55 +0000 (23:45 +0000)

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

Mon, 26 Aug 2019 23:45:55 +0000 (23:45 +0000)
author Pyun DoHyun <dh79.pyun@samsung.com>
Mon, 26 Aug 2019 23:45:55 +0000 (23:45 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 26 Aug 2019 23:45:55 +0000 (23:45 +0000)
diff --cc resource/csdk/security/src/oxmpincommon.c
Simple merge
diff --cc resource/csdk/stack/src/ocstack.c
Simple merge
author	Pyun DoHyun <dh79.pyun@samsung.com>
	Mon, 26 Aug 2019 23:45:55 +0000 (23:45 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 26 Aug 2019 23:45:55 +0000 (23:45 +0000)
		1	2
resource/csdk/security/src/oxmpincommon.c	patch \|	diff1 \|	diff2 \|	blob \| history
resource/csdk/stack/src/ocstack.c	patch \|	diff1 \|	diff2 \|	blob \| history