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


Trivial merge