Merge "TextDecorator. Do not destroy the highlight geometry every OnRelayout." into...

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

Thu, 16 Jul 2015 13:02:51 +0000 (06:02 -0700)

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

Thu, 16 Jul 2015 13:02:51 +0000 (06:02 -0700)
author Paul Wisbey <p.wisbey@samsung.com>
Thu, 16 Jul 2015 13:02:51 +0000 (06:02 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 16 Jul 2015 13:02:51 +0000 (06:02 -0700)
diff --cc dali-toolkit/internal/text/decorator/text-decorator.cpp
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Thu, 16 Jul 2015 13:02:51 +0000 (06:02 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 16 Jul 2015 13:02:51 +0000 (06:02 -0700)