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


Trivial merge