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


Trivial merge