[dali_1.1.22] Merge branch 'devel/master' 20/59920/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 19 Feb 2016 10:52:42 +0000 (10:52 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 19 Feb 2016 10:52:42 +0000 (10:52 +0000)
commitd0aad612034b215780ee29e794b4791a122f91d7
treead40268c48c4993249f05c6cdabeb258c915f75d
parent3ebd19dd0b1e9beec0b01da6ac6c812dc6f6b95c
parent302c227ae5025957934c82507c5821c95021e746
[dali_1.1.22] Merge branch 'devel/master'

Change-Id: Iae75dbeb72218a3a72514fa71261ccb680273bd8