[dali_1.2.57] Merge branch 'devel/master' 94/150394/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 15 Sep 2017 10:10:06 +0000 (11:10 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 15 Sep 2017 10:10:06 +0000 (11:10 +0100)
commit81bb4cb83cede27341dc55ffdd85ee6ce50b5340
tree4d964b135f963aac7adf9d929b6eab3442235961
parent19ec3985c044a68f36ce2145db808338a97a498d
parent19bf135c8a23484b08365b93d59e77f8f549d428
[dali_1.2.57] Merge branch 'devel/master'

Change-Id: I3d793628f924425189a030739020f164c3036dac