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


Trivial merge