[dali_1.9.18] Merge branch 'devel/master' 47/237247/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 26 Jun 2020 08:05:51 +0000 (09:05 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 26 Jun 2020 08:05:51 +0000 (09:05 +0100)
Change-Id: Ie6a3cbcee3ba7c2e426e838af543188e463fcadb


Trivial merge