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


Trivial merge