[dali_2.1.4] Merge branch 'devel/master' 96/269096/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 7 Jan 2022 10:06:34 +0000 (10:06 +0000)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 7 Jan 2022 10:06:34 +0000 (10:06 +0000)
Change-Id: I44ec5d44a2e193b8201602b5f1a8161cf1991696


Trivial merge