[dali_1.5.0] Merge branch 'devel/master' 42/224942/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 14 Feb 2020 07:31:27 +0000 (07:31 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 14 Feb 2020 07:31:27 +0000 (07:31 +0000)
Change-Id: Ib23e5d9a155cc08ec77b01eb031d7d491458dbec


Trivial merge