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


Trivial merge