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


Trivial merge