[dali_2.0.40] Merge branch 'devel/master' 47/262847/1
authorDavid Steele <david.steele@samsung.com>
Fri, 20 Aug 2021 11:19:05 +0000 (12:19 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 20 Aug 2021 11:19:05 +0000 (12:19 +0100)
Change-Id: Ic4e05bc2909fc04e59c7a1ea4b15170417cf3294


Trivial merge