[dali_1.3.25] Merge branch 'devel/master' 35/179535/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 18 May 2018 11:04:01 +0000 (12:04 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 18 May 2018 11:04:01 +0000 (12:04 +0100)
Change-Id: Icde7da62b68ead052998652c4732c1cd44858029


Trivial merge