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


Trivial merge