[dali_1.2.51] Merge branch 'devel/master' 92/142592/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:33 +0000 (11:44 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:33 +0000 (11:44 +0100)
commit8e381f95668a543ac1e97dde1c640054e1ebbba3
tree1f774daa2c26b44ac4e1f3f16fbb74dc97b27eb0
parent86a0a83bfad7dfbfd6c08c911b11d259c840fb21
parentd6de27e5b7843a8a07b9ca802be8715bb3844976
[dali_1.2.51] Merge branch 'devel/master'

Change-Id: Id3175b6b52278152da3c41e9b2a3c2816cc656a5