[dali_1.2.61] Merge branch 'devel/master' 67/155567/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:09 +0000 (15:00 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:09 +0000 (15:00 +0100)
Change-Id: I8d2d71824ab618cf71f224392e0e2cfc22956f13


Trivial merge