Merge branch 'devel/master' into devel/graphics 96/258796/1
authorDavid Steele <david.steele@samsung.com>
Tue, 25 May 2021 23:29:00 +0000 (00:29 +0100)
committerDavid Steele <david.steele@samsung.com>
Tue, 25 May 2021 23:29:00 +0000 (00:29 +0100)
commit2c041b42c28712004582073f27b68a060618d8cb
tree3d94033930322bdf6e47f37db0e1950d6de4578a
parent50c46006658a2ce15af301840b041320aa3585ce
parent8323a27565082b4a4be1d55c5d40121e3e3d0020
Merge branch 'devel/master' into devel/graphics

Change-Id: I78062a8d826c1df5c499337e7bcae2a62dff2372