Merge "Import meshctl & bt-shell related apis and fixes" into tizen

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

Fri, 18 May 2018 03:01:11 +0000 (03:01 +0000)

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

Fri, 18 May 2018 03:01:11 +0000 (03:01 +0000)
author Pyun DoHyun <dh79.pyun@samsung.com>
Fri, 18 May 2018 03:01:11 +0000 (03:01 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 18 May 2018 03:01:11 +0000 (03:01 +0000)
diff --cc client/advertising.c

index 5ca4599,b9b9a73..9b1df12

mode 100644,100755..100644
--- 1/client/advertising.c
--- 2/client/advertising.c
+++ b/client/advertising.c
diff --cc client/main.c

index 17a92fd,5e9ac47..1a0a7c1

mode 100644,100755..100644
--- 1/client/main.c
--- 2/client/main.c
+++ b/client/main.c
diff --cc src/adapter.c
Simple merge
diff --cc src/device.c
Simple merge
author	Pyun DoHyun <dh79.pyun@samsung.com>
	Fri, 18 May 2018 03:01:11 +0000 (03:01 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Fri, 18 May 2018 03:01:11 +0000 (03:01 +0000)
		1	2
client/advertising.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/adapter.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/device.c	patch \|	diff1 \|	diff2 \|	blob \| history