[dali_2.0.11] Merge branch 'devel/master' 90/252590/1
authorDavid Steele <david.steele@samsung.com>
Fri, 29 Jan 2021 12:54:03 +0000 (12:54 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 29 Jan 2021 12:54:03 +0000 (12:54 +0000)
Change-Id: If668f27ee58778365fdd80840e2885c88e5cc5bc


Trivial merge