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


Trivial merge