[dali_1.4.18] Merge branch 'devel/master' 39/205339/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 2 May 2019 10:46:30 +0000 (11:46 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 2 May 2019 10:46:30 +0000 (11:46 +0100)
Change-Id: Ic3fc5fda1d41950e11eb8168c0fa7bfffc075dcd


Trivial merge