[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)
commitb15113673eaeb88f0219062ab448e65b9e29db49
treea1bb35ad8d9dd41284aefc58729f63c4f88e800e
parent7ef2a73fc47a5e860de1986120d447a5ed4368d0
parent413e7a832235a01461fc6a809a4b6f6171adcc73
[dali_1.4.18] Merge branch 'devel/master'

Change-Id: Ie1450788e7ebf5f8e477fa46e210aa222481ac9d