From: Pyun DoHyun <dh79.pyun@samsung.com>
Date: Fri, 18 May 2018 03:01:11 +0000 (+0000)
Subject: Merge "Import meshctl & bt-shell related apis and fixes" into tizen
X-Git-Tag: submit/tizen/20180531.061844~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd8e51badb18555cc2ff5980844af5cef087e43c;p=platform%2Fupstream%2Fbluez.git

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

fd8e51badb18555cc2ff5980844af5cef087e43c
diff --cc client/advertising.c
index 5ca4599,b9b9a73..9b1df12
mode 100644,100755..100644
--- a/client/advertising.c
+++ b/client/advertising.c
diff --cc client/main.c
index 17a92fd,5e9ac47..1a0a7c1
mode 100644,100755..100644
--- a/client/main.c
+++ b/client/main.c