Merge "[4.0] Previous model height return problem fixed" into tizen_4.0

author HyunJu Shin <hyunjushin@samsung.com>

Tue, 19 Dec 2017 07:30:15 +0000 (07:30 +0000)

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

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