[dali_1.4.55] Merge branch 'devel/master' 98/223198/1 master
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jan 2020 13:50:22 +0000 (13:50 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Jan 2020 13:50:22 +0000 (13:50 +0000)
Change-Id: Ia67ce58118fe187787bcbffbef98b63bc0f20cc9


Trivial merge