[dali_2.1.21] Merge branch 'devel/master' 18/274718/1
authorDavid Steele <david.steele@samsung.com>
Fri, 6 May 2022 11:37:42 +0000 (12:37 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 6 May 2022 11:37:42 +0000 (12:37 +0100)
commit297bc32320a8b9467e932c6c6cb913a09fa51bf7
tree6be04bec07bfcbd5d6d140d6bfde9cee9efcb4dc
parent6f4133a7f6bd0333699e21a7865d97ce2715f943
parenta89af58f954b0f2b846a2f2c611d990ddde8adab
[dali_2.1.21] Merge branch 'devel/master'

Change-Id: I53ac5cced2cc0b247afc3c2404aca7ad8fc09664