Merge "GetLineCount() after GetTextDirection() returns wrong value." into devel/master

author joogab yun <joogab.yun@samsung.com>

Mon, 2 Dec 2019 01:20:09 +0000 (01:20 +0000)

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

Mon, 2 Dec 2019 01:20:09 +0000 (01:20 +0000)
author joogab yun <joogab.yun@samsung.com>
Mon, 2 Dec 2019 01:20:09 +0000 (01:20 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 2 Dec 2019 01:20:09 +0000 (01:20 +0000)
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	joogab yun <joogab.yun@samsung.com>
	Mon, 2 Dec 2019 01:20:09 +0000 (01:20 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 2 Dec 2019 01:20:09 +0000 (01:20 +0000)