[dali_1.3.50] Merge branch 'devel/master' 59/193259/1
authoradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:22:14 +0000 (12:22 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:22:14 +0000 (12:22 +0000)
commit913b0399d355c7932550d2c0eea027241da35f3d
treee9d3f5c896910ca80e53df8639568ec5aa4497e6
parent37a13b8c501f11961832d7b7eda8351382d835af
parentc021ec3ccfc22980538f749dd10da383c821385d
[dali_1.3.50] Merge branch 'devel/master'

Change-Id: Iede0decea55feae95e0ddef6cd1a70cf2e4b9825