Merge "Revert "Get surrounding and selection text by fd"" into tizen

author Jihoon Kim <jihoon48.kim@samsung.com>

Fri, 10 Jun 2016 01:41:56 +0000 (18:41 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Fri, 10 Jun 2016 01:41:56 +0000 (18:41 -0700)
author Jihoon Kim <jihoon48.kim@samsung.com>
Fri, 10 Jun 2016 01:41:56 +0000 (18:41 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 10 Jun 2016 01:41:56 +0000 (18:41 -0700)
diff --cc ism/extras/wayland_immodule/wayland_imcontext.c
Simple merge
diff --cc ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
Simple merge
author	Jihoon Kim <jihoon48.kim@samsung.com>
	Fri, 10 Jun 2016 01:41:56 +0000 (18:41 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 10 Jun 2016 01:41:56 +0000 (18:41 -0700)
		1	2
ism/extras/wayland_immodule/wayland_imcontext.c	patch \|	diff1 \|	diff2 \|	blob \| history
ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp	patch \|	diff1 \|	diff2 \|	blob \| history