Merge "Merge branch 'devel/master' into devel/graphics" into devel/master

author David Steele <david.steele@samsung.com>

Wed, 26 May 2021 12:27:06 +0000 (12:27 +0000)

committer Gerrit Code Review <gerrit@review>

Wed, 26 May 2021 12:27:06 +0000 (12:27 +0000)
author David Steele <david.steele@samsung.com>
Wed, 26 May 2021 12:27:06 +0000 (12:27 +0000)
committer Gerrit Code Review <gerrit@review>
Wed, 26 May 2021 12:27:06 +0000 (12:27 +0000)
diff --cc dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
Simple merge
author	David Steele <david.steele@samsung.com>
	Wed, 26 May 2021 12:27:06 +0000 (12:27 +0000)
committer	Gerrit Code Review <gerrit@review>
	Wed, 26 May 2021 12:27:06 +0000 (12:27 +0000)