[dali_2.1.4] Merge branch 'devel/master' 97/269097/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 7 Jan 2022 10:06:49 +0000 (10:06 +0000)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 7 Jan 2022 10:06:49 +0000 (10:06 +0000)
commitf93f46de94d69fe4f5a820a80b45b758e09b9a27
treedb3e19846bab40b1e93686bbc7bae089be8656cb
parentaaa9b8b403f73b5d5f82e3d6be59109db3f5b1f8
parent5e18804821f644d9d94fa11e7d917b6cbb0d8651
[dali_2.1.4] Merge branch 'devel/master'

Change-Id: I1dfef02fd6e758ee3aab6af6e84c14ba0e26224f