[dali_1.9.9] Merge branch 'devel/master' 82/231882/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 24 Apr 2020 15:01:24 +0000 (16:01 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 24 Apr 2020 15:01:24 +0000 (16:01 +0100)
Change-Id: I2ae429f1ac1d46582335793a87937bda7fa139cf


Trivial merge