Merge "Fix for Text::Controller." into devel/master

author Paul Wisbey <p.wisbey@samsung.com>

Thu, 23 Mar 2017 10:00:28 +0000 (03:00 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Thu, 23 Mar 2017 10:00:29 +0000 (03:00 -0700)
author Paul Wisbey <p.wisbey@samsung.com>
Thu, 23 Mar 2017 10:00:28 +0000 (03:00 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 23 Mar 2017 10:00:29 +0000 (03:00 -0700)
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Thu, 23 Mar 2017 10:00:28 +0000 (03:00 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 23 Mar 2017 10:00:29 +0000 (03:00 -0700)