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


Trivial merge