Merge branch '1.3-rel' (0ccb497a) 49/21649/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 27 Jul 2017 07:58:13 +0000 (09:58 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 27 Jul 2017 07:58:19 +0000 (09:58 +0200)
Relate-to:
https://gerrit.iotivity.org/gerrit/21599
https://gerrit.iotivity.org/gerrit/21605

Change-Id: I0ccb497a563c54531593386097b709bb106a17ea
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
resource/csdk/include/octypes.h

Simple merge