Merge branch 'devel/master' into devel/graphics
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 3 Feb 2021 18:58:29 +0000 (18:58 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 3 Feb 2021 18:58:29 +0000 (18:58 +0000)

Trivial merge