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


Trivial merge