Merge "Add environment variables for Pinch and Rotation gesture" into devel/master

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

Wed, 5 Feb 2020 12:28:27 +0000 (12:28 +0000)

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

Wed, 5 Feb 2020 12:28:27 +0000 (12:28 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Wed, 5 Feb 2020 12:28:27 +0000 (12:28 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 5 Feb 2020 12:28:27 +0000 (12:28 +0000)
diff --cc dali/internal/adaptor/common/adaptor-impl.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Wed, 5 Feb 2020 12:28:27 +0000 (12:28 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Wed, 5 Feb 2020 12:28:27 +0000 (12:28 +0000)