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


Trivial merge