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


Trivial merge