Merge branch '1.3-rel' 51/19451/2
authorKevin Kane <kkane@microsoft.com>
Mon, 1 May 2017 16:30:48 +0000 (09:30 -0700)
committerKevin Kane <kkane@microsoft.com>
Mon, 1 May 2017 16:30:48 +0000 (09:30 -0700)
commitb4050f909b8d4caa4ed75b9aca8f63ae38b044d7
tree71b6f884e5009f5347f4d987bdaf03a83f41114a
parentcc58983e9d2a050e529ecab9ff04afbea463afa4
parent7afac012c46f39d478e952eb286bda8d81ea5531
Merge branch '1.3-rel'

Change-Id: I6912a792ca82ad8f0f5156c520119523b30bc19f
Signed-off-by: Kevin Kane <kkane@microsoft.com>
resource/IPCA/src/inc/callback.h
resource/IPCA/unittests/SConscript
resource/csdk/stack/octbstack_product_secured.def
resource/csdk/stack/src/ocstack.c