[dali_1.2.41] Merge branch 'devel/master' 49/131349/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 May 2017 12:31:34 +0000 (13:31 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 May 2017 12:31:34 +0000 (13:31 +0100)
commit929a307639e847b44d0c3d23f90798ab7ecc96ee
tree3a6e8fa1a78630cb831ed0c368f5ef65e968af1f
parent502ac9a97635e43f801a67017ac33b33ce96109d
parent4e499fe95fdb9f82f324d031790731a545033fb3
[dali_1.2.41] Merge branch 'devel/master'

Change-Id: I5ad32b6be6613a20e135ec9670a352a3ee27f65c