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


Trivial merge