Merge "[4.0] Fix text scroll start position issue" into tizen_4.0

author HyunJu Shin <hyunjushin@samsung.com>

Thu, 28 Dec 2017 06:07:03 +0000 (06:07 +0000)

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

Thu, 28 Dec 2017 06:07:03 +0000 (06:07 +0000)
author HyunJu Shin <hyunjushin@samsung.com>
Thu, 28 Dec 2017 06:07:03 +0000 (06:07 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 28 Dec 2017 06:07:03 +0000 (06:07 +0000)
diff --cc dali-toolkit/internal/text/text-scroller.cpp
Simple merge
author	HyunJu Shin <hyunjushin@samsung.com>
	Thu, 28 Dec 2017 06:07:03 +0000 (06:07 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Thu, 28 Dec 2017 06:07:03 +0000 (06:07 +0000)