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


Trivial merge