Merge "Fix for text highlight." into devel/master

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

Fri, 17 Jul 2015 13:48:14 +0000 (06:48 -0700)

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

Fri, 17 Jul 2015 13:48:14 +0000 (06:48 -0700)
author Paul Wisbey <p.wisbey@samsung.com>
Fri, 17 Jul 2015 13:48:14 +0000 (06:48 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 17 Jul 2015 13:48:14 +0000 (06:48 -0700)
diff --cc dali-toolkit/internal/text/text-controller-impl.cpp
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Fri, 17 Jul 2015 13:48:14 +0000 (06:48 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 17 Jul 2015 13:48:14 +0000 (06:48 -0700)