[dali_2.0.31] Merge branch 'devel/master' 99/260099/1
authorDavid Steele <david.steele@samsung.com>
Fri, 18 Jun 2021 10:38:24 +0000 (11:38 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 18 Jun 2021 10:38:24 +0000 (11:38 +0100)
Change-Id: I2d6638de5422ba4f92fe0dac02d75e15927d9d97


Trivial merge