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


Trivial merge