From: DoHyun Pyun <dh79.pyun@samsung.com>
Date: Mon, 5 Nov 2018 23:40:17 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_5.0
X-Git-Tag: accepted/tizen/5.0/unified/20181116.080142~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F192458%2F1;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'tizen' into tizen_5.0

Change-Id: I2e4b961e2a7e5f197c35c9d463a18181bd107658
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---

ec20cee296a9ca57656dece0f2c79f0e26b76276