Merge "Even if ELLIPSIS is set to false and ENABLE_AUTO_SCROLL is set to true, Ellips...

author joogab yun <joogab.yun@samsung.com>

Wed, 27 May 2020 01:22:56 +0000 (01:22 +0000)

committer Gerrit Code Review <gerrit@review>

Wed, 27 May 2020 01:22:56 +0000 (01:22 +0000)
author joogab yun <joogab.yun@samsung.com>
Wed, 27 May 2020 01:22:56 +0000 (01:22 +0000)
committer Gerrit Code Review <gerrit@review>
Wed, 27 May 2020 01:22:56 +0000 (01:22 +0000)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
Simple merge
author	joogab yun <joogab.yun@samsung.com>
	Wed, 27 May 2020 01:22:56 +0000 (01:22 +0000)
committer	Gerrit Code Review <gerrit@review>
	Wed, 27 May 2020 01:22:56 +0000 (01:22 +0000)