[dali_1.4.47] Merge branch 'devel/master' 31/218431/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Nov 2019 07:14:46 +0000 (07:14 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Nov 2019 07:14:46 +0000 (07:14 +0000)
Change-Id: I98af0daea18413455f977041569c97469b1164e9


Trivial merge