[dali_1.3.36] Merge branch 'devel/master' 59/186559/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 10 Aug 2018 09:12:17 +0000 (10:12 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 10 Aug 2018 09:12:17 +0000 (10:12 +0100)
commit7cc14ca9e296a20174f2971f0a10f5689f5ccf2e
tree82ac776e4cf3c8cd26959488a553e0ae0cf04739
parentabfe33675e9693e5987f9355818e72a9b845718b
parentf75cc82b963e47a47c64cb6f112848d5d3dafa7c
[dali_1.3.36] Merge branch 'devel/master'

Change-Id: I304ec82bd26456c8594387ab1bf704bb658b1e65