[dali_1.2.51] Merge branch 'devel/master' 90/142590/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:10 +0000 (11:44 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:10 +0000 (11:44 +0100)
Change-Id: I57f7ce85e125514286a81840bef33e542beaaa75


Trivial merge