Merge "Add read-only property for getting text line count" into devel/master

author Heeyong Song <heeyong.song@samsung.com>

Fri, 2 Jun 2017 04:37:37 +0000 (04:37 +0000)

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

Fri, 2 Jun 2017 04:37:37 +0000 (04:37 +0000)
author Heeyong Song <heeyong.song@samsung.com>
Fri, 2 Jun 2017 04:37:37 +0000 (04:37 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 2 Jun 2017 04:37:37 +0000 (04:37 +0000)
diff --cc dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
Simple merge
author	Heeyong Song <heeyong.song@samsung.com>
	Fri, 2 Jun 2017 04:37:37 +0000 (04:37 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Fri, 2 Jun 2017 04:37:37 +0000 (04:37 +0000)