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


Trivial merge