From: David Antler <david.a.antler@intel.com>
Date: Tue, 26 Apr 2016 22:53:25 +0000 (-0700)
Subject: Merge branch 'master' into windows-port
X-Git-Tag: 1.2.0+RC1~258^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b866038372b9c2a014df7a69cfffd6a6071f75b5;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into windows-port

Change-Id: I65de4e8c13f736abe49948a042448d8261f47753
Signed-off-by: David Antler <david.a.antler@intel.com>
---

b866038372b9c2a014df7a69cfffd6a6071f75b5