Merge "[4.0] Compare numberOfCharacters to delete all texts" into tizen_4.0

author Seoyeon Kim <seoyeon2.kim@samsung.com>

Mon, 11 Dec 2017 02:10:21 +0000 (02:10 +0000)

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

Mon, 11 Dec 2017 02:10:21 +0000 (02:10 +0000)
author Seoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 11 Dec 2017 02:10:21 +0000 (02:10 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 11 Dec 2017 02:10:21 +0000 (02:10 +0000)
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	Seoyeon Kim <seoyeon2.kim@samsung.com>
	Mon, 11 Dec 2017 02:10:21 +0000 (02:10 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 11 Dec 2017 02:10:21 +0000 (02:10 +0000)