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


Trivial merge