[dali_1.2.33] Merge branch 'devel/master' 42/122442/2
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:31:42 +0000 (11:31 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:31:46 +0000 (11:31 +0100)
commit4f5450203b57333db6c4b649aa72cf6e796158d9
tree3d5a682e617f20c026dcddf587ce540c7d1569e3
parentb4e387c7e0bf73c2892f8a8c1d375faf05ee11c1
parent83ac06a120f3a8ddadeb5ea00dce1823afb8c9ff
[dali_1.2.33] Merge branch 'devel/master'

Change-Id: I96f3f8887814d6813999650dfa210bd3ce946992