[dali_1.9.21] Merge branch 'devel/master' 18/238818/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Jul 2020 12:12:48 +0000 (13:12 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 17 Jul 2020 12:12:48 +0000 (13:12 +0100)
commit9cc4ef40fad46f285ffb0a1c9ffa19b160f4ffae
tree76d0d0b968d245710124b0e1a8cff5a893ad90f1
parenta67bddb9946a20e3eed7d71ade2ed8b20eccdf38
parentf063848fc7a2a9a5218106881f156000161c69b7
[dali_1.9.21] Merge branch 'devel/master'

Change-Id: I4c36c9cfae6e4ee06af3d261c646ce947d0596c7