[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)
Change-Id: I260547ee399b2105149443b07165f367c024bf31


Trivial merge