Merge "[4.0] Send the empty string to IME when PlaceholderText shows" into tizen_4.0

author dongsug song <dongsug.song@samsung.com>

Mon, 11 Dec 2017 02:02:04 +0000 (02:02 +0000)

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

Mon, 11 Dec 2017 02:02:04 +0000 (02:02 +0000)
author dongsug song <dongsug.song@samsung.com>
Mon, 11 Dec 2017 02:02:04 +0000 (02:02 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 11 Dec 2017 02:02:04 +0000 (02:02 +0000)
diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge
author	dongsug song <dongsug.song@samsung.com>
	Mon, 11 Dec 2017 02:02:04 +0000 (02:02 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 11 Dec 2017 02:02:04 +0000 (02:02 +0000)