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


Trivial merge