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


Trivial merge