Merge branch 'master' into iot-1785
authorKevin Kane <kkane@microsoft.com>
Wed, 22 Mar 2017 02:26:26 +0000 (19:26 -0700)
committerKevin Kane <kkane@microsoft.com>
Wed, 22 Mar 2017 02:26:30 +0000 (19:26 -0700)
commitdb6ac717c0e855d0f1b2fbb5cd2cbcf7b2162999
tree7da8c7cbeeb35199d5c00b642739e9a0dc55fdd2
parent1227979bfc9f0525f8892d31b572301b71520e2d
parent65f821524d18cb56f195b2b2e2aedc8928199f7f
Merge branch 'master' into iot-1785

Change-Id: If30ba205d4fcb0b5dc969f83d464509a8059ef3f
Signed-off-by: Kevin Kane <kkane@microsoft.com>
resource/csdk/connectivity/api/cacommon.h
resource/csdk/security/SConscript
resource/csdk/security/include/securevirtualresourcetypes.h
resource/csdk/security/src/secureresourcemanager.c