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


Trivial merge