Merge branch '1.3-rel' (4239a6c) 35/23735/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Mon, 11 Dec 2017 15:00:47 +0000 (16:00 +0100)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Mon, 11 Dec 2017 15:00:58 +0000 (16:00 +0100)
Change-Id: I4239a6c37d27f1d0b776f32a211be6bba7e4d5f8
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
java/jni/JniOcPlatform.h
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/credresource.c

Simple merge