Merge "Add the protected code and fix the crash issue" into devel/master

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

Fri, 22 Dec 2017 15:07:43 +0000 (15:07 +0000)

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

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