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


Trivial merge