From: Younghyun Joo <yh_.joo@samsung.com>
Date: Sat, 19 Sep 2015 09:09:56 +0000 (+0900)
Subject: Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation
X-Git-Tag: 1.2.0+RC1~1096
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f42435d7dd419feef8ebad3d60010bf76dea221f;p=platform%2Fupstream%2Fiotivity.git

Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation

Change-Id: I56e84e31987766e5fc97cf3dafa7882f55ae1ef4
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
---

f42435d7dd419feef8ebad3d60010bf76dea221f