[dali_1.4.53] Merge branch 'devel/master' 13/222213/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 10 Jan 2020 11:50:52 +0000 (11:50 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 10 Jan 2020 11:50:52 +0000 (11:50 +0000)
Change-Id: I2e7f452a62e642d3f076565658be00f27f30005c


Trivial merge