Merge "[4.0] Make sure mClearAll is true when calling GetNaturalSize()" into tizen_4.0

author HyunJu Shin <hyunjushin@samsung.com>

Tue, 9 Jan 2018 01:45:29 +0000 (01:45 +0000)

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

Tue, 9 Jan 2018 01:45:29 +0000 (01:45 +0000)
author HyunJu Shin <hyunjushin@samsung.com>
Tue, 9 Jan 2018 01:45:29 +0000 (01:45 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 9 Jan 2018 01:45:29 +0000 (01:45 +0000)
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	HyunJu Shin <hyunjushin@samsung.com>
	Tue, 9 Jan 2018 01:45:29 +0000 (01:45 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 9 Jan 2018 01:45:29 +0000 (01:45 +0000)