[dali_1.2.64] Merge branch 'devel/master' 65/158865/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 3 Nov 2017 12:27:45 +0000 (12:27 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 3 Nov 2017 12:27:45 +0000 (12:27 +0000)
commit57d182fb519d68bc12b5078bf837f1f425d98721
tree4b91338731a52353c0cb0316998b4eb872abe8b8
parentaf9100d2cfdd582fcd5702d3394c9c4936072d8e
parentaa7f2c0a4e8032c1957a97ed40f2decefb56166b
[dali_1.2.64] Merge branch 'devel/master'

Change-Id: I441e187bb544c99a44836ed237733f1134c52dba