[dali_1.1.42] Merge branch 'devel/master' 03/79203/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:43:52 +0000 (17:43 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:43:52 +0000 (17:43 +0100)
commit01e2bff4fdf8b6212f71f7e38d87a7bb1ceff14f
treefcf7322b2414b26e675acbae182fc8a24cfda725
parent0d965a29cd89fe044757ffce9b5c7ba973f66487
parente055792202b47e3dc05aefb61fcbf34fc39ae9fe
[dali_1.1.42] Merge branch 'devel/master'

Change-Id: Iafc780962c7d955d68f0067ab36cf698e3c065d8