Merge "Add isf_control_hide_ime () API" into tizen

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

Mon, 11 Apr 2016 09:59:00 +0000 (02:59 -0700)

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

Mon, 11 Apr 2016 09:59:00 +0000 (02:59 -0700)
author Jihoon Kim <jihoon48.kim@samsung.com>
Mon, 11 Apr 2016 09:59:00 +0000 (02:59 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 11 Apr 2016 09:59:00 +0000 (02:59 -0700)
diff --cc ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
Simple merge
diff --cc ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp

index 325f0a731cbdb2513a77c8df0eaadf83e47c71d3,2eb0073ca3a836a4d5b0f51fc099a84d34a011f9..5d71fbf93e6bdc52415bee24a0761f2a2407abaa

mode 100755,100644..100755
--- 1/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
--- 2/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
+++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
author	Jihoon Kim <jihoon48.kim@samsung.com>
	Mon, 11 Apr 2016 09:59:00 +0000 (02:59 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Mon, 11 Apr 2016 09:59:00 +0000 (02:59 -0700)
		1	2
ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp	patch \|	diff1 \|	diff2 \|	blob \| history