Merge "Text outline support in TextField & TextEditor" into devel/master

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

Tue, 12 Dec 2017 17:00:24 +0000 (17:00 +0000)

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

Tue, 12 Dec 2017 17:00:24 +0000 (17:00 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Tue, 12 Dec 2017 17:00:24 +0000 (17:00 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 12 Dec 2017 17:00:24 +0000 (17:00 +0000)
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Tue, 12 Dec 2017 17:00:24 +0000 (17:00 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 12 Dec 2017 17:00:24 +0000 (17:00 +0000)