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


Trivial merge