[dali_1.3.35] Merge branch 'devel/master' 08/185908/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 3 Aug 2018 09:31:34 +0000 (10:31 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 3 Aug 2018 09:31:34 +0000 (10:31 +0100)
Change-Id: Ic2fdadfae44488147e3a07d8b19a4477c2f648a8


Trivial merge