[dali_1.2.33] Merge branch 'devel/master' 39/122439/3
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:25:44 +0000 (11:25 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:25:53 +0000 (11:25 +0100)
commite9dafd8227dc8d72cc4d02f0e14c2e9e929cb635
treef6a03504a75c346c78c22d95a1153b4b1a28b3ea
parent9a737a3670d68c5fabd8ffeecd3564f83ccc79f8
parentd4a6276654c28c6acdc51d0d238feabed1da91d7
[dali_1.2.33] Merge branch 'devel/master'

Change-Id: I055a30c68f33e037a611c30c4e6a5b5afb1f6f99