[dali_1.3.24] Merge branch 'devel/master' 97/178597/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 10 May 2018 14:56:35 +0000 (15:56 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 10 May 2018 14:56:35 +0000 (15:56 +0100)
commit18e7c9a90a33a23528cb2de5bb4f6060ee86bca2
treecfc9c7d76df12311fc1c1e506ed681180388172e
parent4fd691278c03d7f8e539ea04f9ff43ef7a6dfcc7
parentfd3422fa47a62340785d2b00b82c223526fbd789
[dali_1.3.24] Merge branch 'devel/master'

Change-Id: I754a2beaa18ada7c853cc16f51f667315ce1c69e