Merge "Text scroller renderer bug fix" into devel/master

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

Mon, 5 Jun 2017 10:19:20 +0000 (10:19 +0000)

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

Mon, 5 Jun 2017 10:19:20 +0000 (10:19 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Mon, 5 Jun 2017 10:19:20 +0000 (10:19 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 5 Jun 2017 10:19:20 +0000 (10:19 +0000)
diff --cc dali-toolkit/internal/text/text-scroller.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Mon, 5 Jun 2017 10:19:20 +0000 (10:19 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 5 Jun 2017 10:19:20 +0000 (10:19 +0000)