[dali_1.9.6] Merge branch 'devel/master' 70/229770/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 3 Apr 2020 07:39:14 +0000 (08:39 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 3 Apr 2020 07:39:14 +0000 (08:39 +0100)
Change-Id: Id2057674ddde49f7dc96e281860c3d5fd96128e4


Trivial merge