[dali_1.3.18] Merge branch 'devel/master' 81/174281/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Thu, 29 Mar 2018 13:04:23 +0000 (14:04 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Thu, 29 Mar 2018 13:04:23 +0000 (14:04 +0100)
commit99fd06dce1467ad0eb3254b780a704ec7c1865ec
tree72b2462bf157e775950f55d97a69f03e68109785
parent17a50c65bbd1e9bb6b99fe0e07fdfe0a7f5fc3b8
parent8590f167cee7e44b8240885a892e321f9f5a7a79
[dali_1.3.18] Merge branch 'devel/master'

Change-Id: I280aff65efcf5dded54e4dfdef491c22ec53df94