Merge "Fix text scrolling bug" into devel/master

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

Thu, 4 Jan 2018 17:33:31 +0000 (17:33 +0000)

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

Thu, 4 Jan 2018 17:33:32 +0000 (17:33 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Thu, 4 Jan 2018 17:33:31 +0000 (17:33 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 4 Jan 2018 17:33:32 +0000 (17:33 +0000)
diff --cc dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Thu, 4 Jan 2018 17:33:31 +0000 (17:33 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Thu, 4 Jan 2018 17:33:32 +0000 (17:33 +0000)