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


Trivial merge