[dali_1.4.53] Merge branch 'devel/master' 17/222217/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 10 Jan 2020 11:51:23 +0000 (11:51 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 10 Jan 2020 11:51:23 +0000 (11:51 +0000)
Change-Id: I4eaf24327feba79eeb7c09d37b9afc76f50e9aeb


Trivial merge