[dali_1.9.25] Merge branch 'devel/master' 97/241097/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 14 Aug 2020 10:40:06 +0000 (11:40 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 14 Aug 2020 10:40:06 +0000 (11:40 +0100)
commit33df9e21c1de2b0a8125d78de24aed2033d24d1d
treead0273905953559978d21a359b86b181efc79cb5
parentb630ffb1db0b46a6727d509bb2bf9b2f4b853168
parentad4c9eb2032b75f6eb88d97caa1a00350995277a
[dali_1.9.25] Merge branch 'devel/master'

Change-Id: Id6582552b2ee39a6e07f185d6cbfd8d828867453