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


Trivial merge