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


Trivial merge