[dali_1.2.33] Merge branch 'devel/master' 40/122440/2
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:29:00 +0000 (11:29 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 3 Apr 2017 10:29:10 +0000 (11:29 +0100)
commita5c87483d20a24891a2507b98c95a2569b16e1e1
tree7e8bf3d9fd45dee00b0e060f6d013f77d7f5abbb
parent24a213817e68c019dbcdab3dc442a8986cb4002a
parent7d2e7be39d0ff033057a624d441075d6a3bee3d7
[dali_1.2.33] Merge branch 'devel/master'

Change-Id: I4b4381e8d419d1de776412ac970de029387734bd