Merge branch 'devel/master' into devel/graphics 23/256023/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 26 Mar 2021 16:22:23 +0000 (16:22 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 26 Mar 2021 16:22:23 +0000 (16:22 +0000)
commitf13ce10b8b95f3f73e83602a1489537f47f1ae6f
tree175ea52bbb6370d299d5677889368e47eafabd13
parent20e28e53e204b0e28e8f20c2d3d9bd6fdf328a26
parent58b8a3ea31c337988da088c6bc3e5849d3524245
Merge branch 'devel/master' into devel/graphics

Change-Id: I573e8a3631457f1a5604cb88e616fe5dd7035c43
automated-tests/src/dali/utc-Dali-Actor.cpp