Merge "Upload resource only without rendering while aplication is paused" into devel...

author Adeel Kazmi <adeel.kazmi@samsung.com>

Wed, 18 Sep 2019 10:01:11 +0000 (10:01 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Wed, 18 Sep 2019 10:01:11 +0000 (10:01 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Wed, 18 Sep 2019 10:01:11 +0000 (10:01 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 18 Sep 2019 10:01:11 +0000 (10:01 +0000)
diff --cc dali/internal/adaptor/common/adaptor-impl.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Wed, 18 Sep 2019 10:01:11 +0000 (10:01 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Wed, 18 Sep 2019 10:01:11 +0000 (10:01 +0000)