[dali_1.4.57] Merge branch 'devel/master' 49/224149/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 6 Feb 2020 14:31:36 +0000 (14:31 +0000)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 6 Feb 2020 14:31:36 +0000 (14:31 +0000)
Change-Id: I8853b142c6778a543986d7414f5b1e9292c1a801


Trivial merge