Merge branch 'devel/master' into devel/graphics 12/253312/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 8 Feb 2021 17:50:45 +0000 (17:50 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 8 Feb 2021 17:50:45 +0000 (17:50 +0000)
Change-Id: I7b1fb63d1641f531f3f48cc594d5b05c8400863a


Trivial merge