[dali_2.0.4] Merge branch 'devel/master' 57/249057/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 4 Dec 2020 14:57:51 +0000 (14:57 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 4 Dec 2020 14:57:51 +0000 (14:57 +0000)
Change-Id: Ie42dbd02bdc908cad9531fc7612609c068dc9883


Trivial merge