Merge "TextField is re-laied out after its properties are changed." into devel/master

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

Mon, 11 Mar 2019 10:35:32 +0000 (10:35 +0000)

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

Mon, 11 Mar 2019 10:35:32 +0000 (10:35 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Mon, 11 Mar 2019 10:35:32 +0000 (10:35 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 11 Mar 2019 10:35:32 +0000 (10:35 +0000)
diff --cc automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
Simple merge
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Mon, 11 Mar 2019 10:35:32 +0000 (10:35 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 11 Mar 2019 10:35:32 +0000 (10:35 +0000)
		1	2
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-controller.cpp	patch \|	diff1 \|	diff2 \|	blob \| history