Merge branch '1.4-rel' (2116f2d) 71/26071/2
authorPhilippe Coval <p.coval@samsung.com>
Mon, 9 Jul 2018 15:59:43 +0000 (17:59 +0200)
committerPhilippe Coval <p.coval@samsung.com>
Mon, 9 Jul 2018 15:59:47 +0000 (17:59 +0200)
commitc2bb0754798cd0d318b133f18cb9428148455f8d
tree59a963f8466927d74035971e6a96d68c387c6bc9
parent082f4bf676c0e75f7babfafc268c8d98f9db9004
parent2116f2d2d86ef45f7d5eca8074279c7c935c6b0d
Merge branch '1.4-rel' (2116f2d)

Relate-to:
      I2c9e39600e4d336b5a01dacf50aef8d79caac1e0
      I560830d62bad76447bf1c4acaf004cc779fbcdfb
      If23e5c258e61298e6b10996402b0961b2ebcd672

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