Merge "Previous model height return problem fixed" into devel/master

author Adeel Kazmi <adeel.kazmi@samsung.com>

Fri, 27 Apr 2018 07:53:39 +0000 (07:53 +0000)

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

Fri, 27 Apr 2018 07:53:39 +0000 (07:53 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Fri, 27 Apr 2018 07:53:39 +0000 (07:53 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 27 Apr 2018 07:53:39 +0000 (07:53 +0000)
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Fri, 27 Apr 2018 07:53:39 +0000 (07:53 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Fri, 27 Apr 2018 07:53:39 +0000 (07:53 +0000)