[dali_1.9.2] Merge branch 'devel/master' 49/226949/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 6 Mar 2020 12:03:34 +0000 (12:03 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 6 Mar 2020 12:03:34 +0000 (12:03 +0000)
Change-Id: I156a5bb63461f2c68d99ef2e5914f5cebefe8737


Trivial merge