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


Trivial merge