[dali_1.4.26] Merge branch 'devel/master' 94/208794/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 28 Jun 2019 10:43:13 +0000 (11:43 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 28 Jun 2019 10:43:13 +0000 (11:43 +0100)
Change-Id: I2d35bb957985ca22dd74dd3c45dee2164543bece


Trivial merge