[dali_1.9.36] Merge branch 'devel/master' 36/246536/1
authorDavid Steele <david.steele@samsung.com>
Fri, 30 Oct 2020 14:34:16 +0000 (14:34 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 30 Oct 2020 14:34:16 +0000 (14:34 +0000)
commitf0ef65b6e0d4df6f7c7cff9fe828472f75e2cf37
tree22132115a10d7bf3e19a4ebe44ce32d931ed073f
parent40dbd748b478d8e94b50e96af803ee712aa44452
parenta99298eb5299ee9b373d3b29d97f6e18b0520998
[dali_1.9.36] Merge branch 'devel/master'

Change-Id: I6e6c163ce501214fcfc44d62731b3121d3c1fbaf