[dali_1.3.24] Merge branch 'devel/master' 94/178594/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 10 May 2018 14:55:52 +0000 (15:55 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 10 May 2018 14:55:52 +0000 (15:55 +0100)
commit22abf055f0fbd648a8566e53e34fcf9e7d921f91
treed1972d47722afc275a111e3cb52c9ade680006ba
parentfd27cfc7f323bdb2ed526c9feb752d17d878fba2
parentf54249fd14bb47f33c8fd07c7310a9c30d388c2c
[dali_1.3.24] Merge branch 'devel/master'

Change-Id: I260547ee399b2105149443b07165f367c024bf31