From: Kevin Kane <kkane@microsoft.com>
Date: Fri, 31 Mar 2017 19:59:42 +0000 (-0700)
Subject: [IOT-1785] Merge branch 'iot-1785'
X-Git-Tag: 1.3.0~375^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a73131d051307dd846f5e9f249cf73444fcdb8e7;p=platform%2Fupstream%2Fiotivity.git

[IOT-1785] Merge branch 'iot-1785'

Change-Id: I9f8270ab9643dcf203b9fbcd20a37ee482659e16
Signed-off-by: Kevin Kane <kkane@microsoft.com>
---

a73131d051307dd846f5e9f249cf73444fcdb8e7