[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)
commitf833a0afa6e5d95d97d945af18bc1ecf8ae2c06f
treecb0eff7789183e896bd1506ba530ee0b66cd7bbf
parent1f5979e0678feb240f28c482c1a70785b6f99807
parent9af65d35684f4fde273631a83a3a953a9975ab39
[dali_2.0.5] Merge branch 'devel/master'

Change-Id: I96c5f0eeed3b2a61b2f6bca6844dc9b05c73a185