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


Trivial merge