Merge branch '1.3-rel' (27355aa8) 29/20229/4
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 4 Jul 2017 08:01:37 +0000 (10:01 +0200)
committerPhil Coval <philippe.coval@osg.samsung.com>
Tue, 4 Jul 2017 09:44:24 +0000 (09:44 +0000)
commit6368fee173df2e677d3a6cb534a0b261e35d6841
treef16cee1b3649ec32562d9c8aa37fbf2065cc42a6
parent72800e2bfb271d51136f1bda883983ea9e1ea5b0
parent27355aa8ac330d9b8935ab964fc3b9c3c157080d
Merge branch '1.3-rel' (27355aa8)

Conflicts:
  extlibs/libcoap/SConscript
  extlibs/wksxmppxep/SConscript
  resource/csdk/security/provisioning/unittest/SConscript

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: I907be8be5fbe6cd7d244dd307eb443b983ba015e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
extlibs/android/sdk/SConscript
extlibs/arduino/SConscript
extlibs/wksxmppxep/SConscript
resource/csdk/security/provisioning/unittest/SConscript