Merge "Added style name for styling TextEditor ScrollBar" into devel/master

author minho.sun <minho.sun@samsung.com>

Mon, 5 Jun 2017 05:27:16 +0000 (05:27 +0000)

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

Mon, 5 Jun 2017 05:27:17 +0000 (05:27 +0000)
author minho.sun <minho.sun@samsung.com>
Mon, 5 Jun 2017 05:27:16 +0000 (05:27 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 5 Jun 2017 05:27:17 +0000 (05:27 +0000)
diff --cc dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
Simple merge
author	minho.sun <minho.sun@samsung.com>
	Mon, 5 Jun 2017 05:27:16 +0000 (05:27 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 5 Jun 2017 05:27:17 +0000 (05:27 +0000)