[dali_1.9.17] Merge branch 'devel/master' 10/236710/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 19 Jun 2020 11:04:03 +0000 (12:04 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 19 Jun 2020 11:04:03 +0000 (12:04 +0100)
Change-Id: I588ebe5a40c2f30331d67827f8d1ec9b71a42c9a


Trivial merge