Merge "Merge branch '1.3-rel' (c95aa699)"
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Wed, 14 Jun 2017 21:53:23 +0000 (21:53 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 14 Jun 2017 21:53:24 +0000 (21:53 +0000)
commit8e496c4f1c1a97195718f7098764e6c8866172e3
treea22826ce555abbd69420484517508b684f869a03
parentae20072dc07ad11d770bbeccdcbefee685aeb504
parentf0eff22bfb87dc0539fd1fc8d58b1e3f386d9edc
Merge "Merge branch '1.3-rel' (c95aa699)"
extlibs/mbedtls/SConscript
resource/csdk/connectivity/test/ca_api_unittest.cpp
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/security/provisioning/sample/sampleserver_mvjustworks.cpp
resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp
resource/csdk/stack/src/ocresource.c