Merge " Calculate a new height when text was changed." into devel/master

author Jinho, Lee <jeano.lee@samsung.com>

Thu, 27 Jul 2017 10:41:59 +0000 (10:41 +0000)

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

Thu, 27 Jul 2017 10:42:00 +0000 (10:42 +0000)
author Jinho, Lee <jeano.lee@samsung.com>
Thu, 27 Jul 2017 10:41:59 +0000 (10:41 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 27 Jul 2017 10:42:00 +0000 (10:42 +0000)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
Simple merge
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	Jinho, Lee <jeano.lee@samsung.com>
	Thu, 27 Jul 2017 10:41:59 +0000 (10:41 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Thu, 27 Jul 2017 10:42:00 +0000 (10:42 +0000)
		1	2
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-controller.cpp	patch \|	diff1 \|	diff2 \|	blob \| history