[dali_1.4.47] Merge branch 'devel/master' 33/218433/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Nov 2019 07:15:08 +0000 (07:15 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Nov 2019 07:15:08 +0000 (07:15 +0000)
Change-Id: Icbe305fff35ed76718f15db8ab9247fc1a95e10e


Trivial merge