[dali_1.4.15] Merge branch 'devel/master' 24/203424/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Apr 2019 10:49:48 +0000 (11:49 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Apr 2019 10:49:48 +0000 (11:49 +0100)
Change-Id: I0a8b6fd3425265194191aed274f8ef10cde25822


Trivial merge