[dali_1.3.7] Merge branch 'devel/master' 65/166965/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 12 Jan 2018 14:07:31 +0000 (14:07 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 12 Jan 2018 14:07:31 +0000 (14:07 +0000)
Change-Id: Ia3ba8ef4c012f6e7d6e1afe853bbccbe38460d08


Trivial merge