Merge branch '1.3-rel' (7a5eccee) 43/21443/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 14 Jul 2017 08:24:20 +0000 (10:24 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 14 Jul 2017 08:24:56 +0000 (10:24 +0200)
Relate-to: https://gerrit.iotivity.org/gerrit/21299

Change-Id: I7a5eccee6b699156dc3f735e05040d5515b98717
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
resource/csdk/stack/src/ocstack.c

Simple merge