Merge branch 'devel/master' into devel/graphics 95/258795/2
authorDavid Steele <david.steele@samsung.com>
Tue, 25 May 2021 23:28:35 +0000 (00:28 +0100)
committerDavid Steele <david.steele@samsung.com>
Wed, 26 May 2021 10:43:20 +0000 (11:43 +0100)
commit7923c3d4f1d8ef3866e07eb43e5f6806cb108ef2
treec4f53c8147cc6d4727ca6cbd51e8bc2514fbb11b
parent5cf8a1a1a83ae490ca79fff224a1e4de2c42816c
parent3cc49ee528659b670f46b43be6a9de552f282724
Merge branch 'devel/master' into devel/graphics

Change-Id: I51fef49392010ab166900229c74b05bb0520fcd3
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp