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


Trivial merge