[dali_1.2.21] Merge branch 'devel/master' 47/109047/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jan 2017 14:01:50 +0000 (14:01 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jan 2017 14:01:50 +0000 (14:01 +0000)
commitb0ecfed5248b15e38ddbc1d1e4ee11f0b840310e
tree717a305721832eab0a094dec052d75bc333f817e
parenta12337bbdda3171c8f8500bf20fd298accf2b0a7
parent5095ed6110752e12140dc2c5b41c1ec23d390050
[dali_1.2.21] Merge branch 'devel/master'

Change-Id: I53d98a90483863158085cfaece8498bd7172b154