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

Merge branch 'master' into resource-encapsulation

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

762e0f294caf0accf0f7200107f4ed7ceaf676a9