From: hunje.yeon <hunje.yeon@samsung.com>
Date: Fri, 3 Jul 2015 07:21:44 +0000 (+0900)
Subject: Merge branch 'master' into resource-manipulation
X-Git-Tag: 1.2.0+RC1~1430^2~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e258465880a69835a8597de64d61a1f851b818d3;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into resource-manipulation

Update the lastest changes of 'master' into 'resource-manipulation' branch

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

e258465880a69835a8597de64d61a1f851b818d3