[dali_1.9.6] Merge branch 'devel/master' 67/229767/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 3 Apr 2020 07:38:56 +0000 (08:38 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 3 Apr 2020 07:38:57 +0000 (08:38 +0100)
Change-Id: Iec2f82eac4a331b9311ba6752847ed8fdfae67cf


Trivial merge