[dali_1.9.25] Merge branch 'devel/master' 96/241096/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 14 Aug 2020 10:39:52 +0000 (11:39 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 14 Aug 2020 10:39:52 +0000 (11:39 +0100)
Change-Id: I2371bb66d9710420278d598c8c607ac136e1260a


Trivial merge