[dali_1.4.17] Merge branch 'devel/master' 19/204819/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 Apr 2019 12:53:26 +0000 (13:53 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 Apr 2019 12:53:26 +0000 (13:53 +0100)
Change-Id: I54589bbd0824d4862f26b8d432e8c01a7eb78ec7


Trivial merge