Merge branch '1.4-rel' (01fd9ec) 71/25571/1
authorPhilippe Coval <p.coval@samsung.com>
Thu, 31 May 2018 08:22:26 +0000 (10:22 +0200)
committerPhilippe Coval <p.coval@samsung.com>
Thu, 31 May 2018 08:22:29 +0000 (10:22 +0200)
commit8e6e10284c7b9edf6f85c65c95e0813b0a2eafba
tree8b315bf5ec31bcd9a4edd2f35d2cd2ea2effaf01
parent9fcb2a0445decedbddc865ad410030a5d49e35b9
parent01fd9ecd719dbb68b74712b058a50d768f90624d
Merge branch '1.4-rel' (01fd9ec)

Relate-to:
      I25836d20803e82764b8f9dbc30ddfde80810518f
      I40a9b3c3f89894e92c75c798e918f1713e9e6740
      I44bd904f13cdd7b44e34e47a69ce403248e550b9
      Idbe257c1baa90a7cabce6fe6113ab09fb5644eab
      I1cfad27fcfd5cf3a42510412e6555b84ea905259

Change-Id: I01fd9ecd719dbb68b74712b058a50d768f90624d
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>