[dali_1.2.41] Merge branch 'devel/master' 48/131348/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 May 2017 12:31:18 +0000 (13:31 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 May 2017 12:31:18 +0000 (13:31 +0100)
Change-Id: Ic901dc1349ea54408ce1dde4625bc88df6381278


Trivial merge