[dali_2.0.22] Merge branch 'devel/master' 32/257032/1
authorDavid Steele <david.steele@samsung.com>
Fri, 16 Apr 2021 13:03:46 +0000 (14:03 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 16 Apr 2021 13:03:46 +0000 (14:03 +0100)
Change-Id: Ib36b27b8c000170a19bdee2c24cd748607e120c8


Trivial merge