[dali_1.1.42] Merge branch 'devel/master' 06/79206/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:44:14 +0000 (17:44 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:44:14 +0000 (17:44 +0100)
commita70ecbcb1da52ba43a31e6412d7e476e74338a2e
tree10a204dcfc01ded36d5867cbf780bb10f0b93cb5
parente9975b7306a4c728c9817c91412c908c5ec47431
parente5aac16cd330358aa942a3a8b2e2a5fd9a167faa
[dali_1.1.42] Merge branch 'devel/master'

Change-Id: I904cf0c597f9e16c83518e805099ae3cd34f3be6