Merge "Bidirectional conversion table for multiline." into devel/master

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

Fri, 27 May 2016 15:23:17 +0000 (08:23 -0700)

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

Fri, 27 May 2016 15:23:17 +0000 (08:23 -0700)
author Paul Wisbey <p.wisbey@samsung.com>
Fri, 27 May 2016 15:23:17 +0000 (08:23 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 27 May 2016 15:23:17 +0000 (08:23 -0700)
diff --cc dali-toolkit/internal/text/text-controller-impl.cpp
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Fri, 27 May 2016 15:23:17 +0000 (08:23 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 27 May 2016 15:23:17 +0000 (08:23 -0700)