From: Madan Lanka Date: Wed, 16 Sep 2015 00:26:19 +0000 (+0000) Subject: Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation X-Git-Tag: 1.2.0+RC1~1124 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6626b7ae452f10c67d35e580cfcc126481afe5d;p=platform%2Fupstream%2Fiotivity.git Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation --- a6626b7ae452f10c67d35e580cfcc126481afe5d