Merge "Fixed an error adding duplicate primary position.y" into devel/master

author Jinho, Lee <jeano.lee@samsung.com>

Wed, 21 Jun 2017 01:30:00 +0000 (01:30 +0000)

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

Wed, 21 Jun 2017 01:30:00 +0000 (01:30 +0000)
author Jinho, Lee <jeano.lee@samsung.com>
Wed, 21 Jun 2017 01:30:00 +0000 (01:30 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 21 Jun 2017 01:30:00 +0000 (01:30 +0000)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
Simple merge
author	Jinho, Lee <jeano.lee@samsung.com>
	Wed, 21 Jun 2017 01:30:00 +0000 (01:30 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Wed, 21 Jun 2017 01:30:00 +0000 (01:30 +0000)