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


Trivial merge