Merge "Fixed an incorrect ellipsis" into devel/master

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

Tue, 26 Feb 2019 00:33:52 +0000 (00:33 +0000)

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

Tue, 26 Feb 2019 00:33:52 +0000 (00:33 +0000)
author joogab yun <joogab.yun@samsung.com>
Tue, 26 Feb 2019 00:33:52 +0000 (00:33 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 26 Feb 2019 00:33:52 +0000 (00:33 +0000)
diff --cc dali-toolkit/internal/text/rendering/view-model.cpp
Simple merge
author	joogab yun <joogab.yun@samsung.com>
	Tue, 26 Feb 2019 00:33:52 +0000 (00:33 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 26 Feb 2019 00:33:52 +0000 (00:33 +0000)