[dali_1.9.25] Merge branch 'devel/master' 93/241093/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 14 Aug 2020 10:39:28 +0000 (11:39 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 14 Aug 2020 10:39:28 +0000 (11:39 +0100)
commit71171e11405b8d435063ebdd8c1632ec19070cd1
tree631736f7c2d52ae34e69a4ac9116e9decb434d92
parent26f7abfbaeb619136b8a762110f1f14ac2e9d821
parent2f638762d49962aeae8227e7489965ac629c3891
[dali_1.9.25] Merge branch 'devel/master'

Change-Id: I3ce12b071a98d3dd9611e74fa7cb53947e5b4dd6