From: Sachin Agrawal <sachin.agrawal@intel.com>
Date: Mon, 3 Aug 2015 19:15:55 +0000 (-0700)
Subject: Merge branch 'master' into 'security-CKM' branch.
X-Git-Tag: 1.2.0+RC1~999^2^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=752db8ac38907b7a408c7b23adb02b8a39223e45;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into 'security-CKM' branch.


Change-Id: Ic077fb82ebeac6fa50777a083e878c205139b586
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
---

752db8ac38907b7a408c7b23adb02b8a39223e45