[dali_2.0.26] Merge branch 'devel/master' 94/258394/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 14 May 2021 10:22:18 +0000 (11:22 +0100)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 14 May 2021 10:22:18 +0000 (11:22 +0100)
Change-Id: I5b853a635e6ff1c6b1da7301c29c262b051fae22


Trivial merge