From: uzchoi <uzchoi@samsung.com>
Date: Mon, 11 Jul 2016 02:54:47 +0000 (+0900)
Subject: Merge branch 'master' into extended-easysetup
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f38dc188968757d7eec20816b7964b052fe5a32;p=contrib%2Fiotivity.git

Merge branch 'master' into extended-easysetup

Change-Id: Ifad200718955d1f1382178e72c36866b538af622
---

1f38dc188968757d7eec20816b7964b052fe5a32