[dali_1.4.48] Merge branch 'devel/master' 06/219006/1
authoradam.b <adam.b@samsung.com>
Fri, 29 Nov 2019 12:18:10 +0000 (12:18 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 29 Nov 2019 12:18:10 +0000 (12:18 +0000)
commit192e25fb8b9a7a88397a3bca39684a1de40c1704
tree027b5e5ba4cfcc7803b9e0439be15012061f17df
parentcedea137aa5ef05fbee129cda879a820f27479f8
parent22abba4c11ed31a7d7d6837014fc4c2070677acd
[dali_1.4.48] Merge branch 'devel/master'

Change-Id: I18d3a0e15f593c596a197aaf28bb0e1e1b4bd040