[dali_1.2.57] Merge branch 'devel/master' 96/150396/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 15 Sep 2017 10:10:28 +0000 (11:10 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 15 Sep 2017 10:10:28 +0000 (11:10 +0100)
commite9333cfe318586fd503495e28b0d71c0dac4888a
treefbd9e46ab537d46243ec8424057c9104f97b49c4
parentf06a2008293be70a6ae7ff89d45b52f4d49d0fc0
parent52bf5dcc78d87644c3f088fbdbe57d47a914d5ba
[dali_1.2.57] Merge branch 'devel/master'

Change-Id: I5a9eee98d672bde0012ce2bc3a4f0f84ee342e47