From: Harish Kumara Marappa <h.marappa@samsung.com>
Date: Mon, 12 Oct 2015 15:36:08 +0000 (+0530)
Subject: Merge branch 'master' into simulator
X-Git-Tag: 1.2.0+RC1~764^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7d822e9e6ba4476deb12a5b62a0841c42590fb4;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into simulator

Conflicts:
	build_common/SConscript
	service/SConscript

Change-Id: Ib11d0f1e0c9b0daf177ea055db77108d4bd01f4c
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
---

b7d822e9e6ba4476deb12a5b62a0841c42590fb4