Merge "Calculate a new height when full relayout needed" into devel/master

author HyunJu Shin <hyunjushin@samsung.com>

Fri, 14 Jul 2017 07:56:59 +0000 (07:56 +0000)

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

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