[dali_1.9.25] Merge branch 'devel/master' 96/241096/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 14 Aug 2020 10:39:52 +0000 (11:39 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 14 Aug 2020 10:39:52 +0000 (11:39 +0100)
commit8099edc8dcf744a11bec4064fec8f302aba09c26
tree1b3f5cb22f4ec59579a459a6d5989b68b8ac00dc
parent12955ee0c6edc62cc619727cb0711e2c80740f0c
parentdce834b1fd7ab450ceab90353137dfe4c0cabc59
[dali_1.9.25] Merge branch 'devel/master'

Change-Id: I2371bb66d9710420278d598c8c607ac136e1260a