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


Trivial merge