[dali_1.1.22] Merge branch 'devel/master' 21/59921/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 19 Feb 2016 10:52:52 +0000 (10:52 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 19 Feb 2016 10:52:52 +0000 (10:52 +0000)
commit568fa24c83d0e22020a0fd2ab0171f0e58c5c74b
tree7198387fcafe34dd9ef5e7ff2f3e637eb4733ff0
parent7c8b97b68dd1e90533ce8b8da3b074fccf8285d7
parent1524aedcc497228ec87e88a282d2827e89312355
[dali_1.1.22] Merge branch 'devel/master'

Change-Id: Ide6c46cebdd9551549c92d0335ab712cc2125638