Merge branch '1.3-rel' (96293bfd) 65/21765/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Sun, 6 Aug 2017 14:07:46 +0000 (16:07 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Sun, 6 Aug 2017 14:07:54 +0000 (16:07 +0200)
commitbd3229dc75e060682f5e10b6db42c90966f7e5b2
treeb95e968041bded072f95f2dd0abcf66b56c3fb4c
parenta478d169a24a9881d2d7d957ad0178b374a1cefc
parent96293bfdf8f06e9ddc3716ef1fecb5bde04e8d38
Merge branch '1.3-rel' (96293bfd)

Relate-to:
https://gerrit.iotivity.org/gerrit/21461
https://gerrit.iotivity.org/gerrit/21425
https://gerrit.iotivity.org/gerrit/21465
https://gerrit.iotivity.org/gerrit/21733

Change-Id: I96293bfdf8f06e9ddc3716ef1fecb5bde04e8d38
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
resource/csdk/connectivity/src/bt_le_adapter/SConscript
resource/csdk/connectivity/src/nfc_adapter/SConscript
service/simulator/SConscript