Merge "Fixed crash issue by null reference" into devel/master

author taeyoon0.lee <taeyoon0.lee@samsung.com>

Tue, 5 Sep 2017 12:10:27 +0000 (12:10 +0000)

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

Tue, 5 Sep 2017 12:10:27 +0000 (12:10 +0000)
author taeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 5 Sep 2017 12:10:27 +0000 (12:10 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 5 Sep 2017 12:10:27 +0000 (12:10 +0000)
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	taeyoon0.lee <taeyoon0.lee@samsung.com>
	Tue, 5 Sep 2017 12:10:27 +0000 (12:10 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 5 Sep 2017 12:10:27 +0000 (12:10 +0000)