[dali_1.3.31] Merge branch 'devel/master' 42/183542/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jul 2018 09:37:54 +0000 (10:37 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jul 2018 09:37:54 +0000 (10:37 +0100)
commit8e8a0e8f9522256174611c80092deffeb8a03142
treeb4b10570436f66e0457f2d543c14dc7ff5ea8432
parentc42b1211131d20e7450806b8d641de8d6fe0cfcd
parent73de509b9ab66428fecdb42d02e2ef44afa367c6
[dali_1.3.31] Merge branch 'devel/master'

Change-Id: I544db79d472f218855e8a850bcf82e9136e74ed2