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


Trivial merge