[dali_1.2.55] Merge branch 'devel/master' 18/147218/1
authorUmar <m.umar@partner.samsung.com>
Fri, 1 Sep 2017 11:35:52 +0000 (12:35 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 1 Sep 2017 11:35:52 +0000 (12:35 +0100)
commit0c493b8df5efc0de5295232a3c09245430dfaca1
treec1129c7149ca0e2fa5c4a4ef824bcda21b6c6906
parentd413b2f6e70764c7f4620cf9bdb26419ff44d6ee
parent823d6147348bd0496d812ee1eb2ace3af88a3d2e
[dali_1.2.55] Merge branch 'devel/master'

Change-Id: Ifd1e163f90431cabf9c5e869c3165d6531fb7855