[dali_1.9.7] Merge branch 'devel/master' 75/230375/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 9 Apr 2020 14:49:14 +0000 (15:49 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 9 Apr 2020 14:49:14 +0000 (15:49 +0100)
Change-Id: Ib084e5d3018472747f8285bfdffa2faf6a1328e5


Trivial merge