From: lankamadan <lanka.madan@samsung.com>
Date: Sat, 5 Mar 2016 04:34:02 +0000 (+0000)
Subject: Merge "Merge branch 'easysetup'"
X-Git-Tag: 1.2.0+RC1~597
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d63f63f4aae3b14661d1b9f1db113cc213162780;p=platform%2Fupstream%2Fiotivity.git

Merge "Merge branch 'easysetup'"
---

d63f63f4aae3b14661d1b9f1db113cc213162780
diff --cc tools/tizen/.gbs.conf
index 88e8cf9,9235ad7..88e8cf9
mode 100644,100755..100755
--- a/tools/tizen/.gbs.conf
+++ b/tools/tizen/.gbs.conf