From: hunje.yeon <hunje.yeon@samsung.com>
Date: Thu, 4 Jun 2015 00:43:12 +0000 (+0900)
Subject: Merge branch 'master' into resource-manipulation
X-Git-Tag: 1.2.0+RC1~1430^2~169
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ba440a073c2b5496cfaa5e5606353dad515e3c0;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into resource-manipulation

Update latest changes from master branch into resource-manipulation

Change-Id: I70c34dc88a66acf933deb9f8a8ca30c329470251
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
---

8ba440a073c2b5496cfaa5e5606353dad515e3c0