From: uzchoi <uzchoi@samsung.com>
Date: Mon, 18 Jul 2016 02:36:12 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/master' into extended-easysetup
X-Git-Tag: 1.2.0+RC1~136^2^2~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5c63ff4150291f73fe6fc826d00bdc0141d2fe0;p=platform%2Fupstream%2Fiotivity.git

Merge remote-tracking branch 'origin/master' into extended-easysetup

Conflicts:
	service/easy-setup/mediator/richsdk/src/RemoteEnrolleeResource.cpp

Change-Id: I2868246122ea799fd75111f439ed1f410f950592
---

a5c63ff4150291f73fe6fc826d00bdc0141d2fe0