[dali_2.0.5] Merge branch 'devel/master' 48/249448/1
authorDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2020 12:11:17 +0000 (12:11 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2020 12:11:17 +0000 (12:11 +0000)
Change-Id: I96c5f0eeed3b2a61b2f6bca6844dc9b05c73a185


Trivial merge