[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)
commit56cc187f6a376cce673392857ea9ac34bca6f303
tree61ae30f709d8677e9a71d6614235fb3418902146
parent091424324901c46a18959bfc0dd52f7ce8a0a811
parent6439b07bef126404973b0b994851016bc9c06c3a
[dali_1.2.41] Merge branch 'devel/master'

Change-Id: Ic901dc1349ea54408ce1dde4625bc88df6381278