Merge branch 'tizen_3.0' into tizen

Change-Id: I2b7b0295b943f1e98fd66f9b530501bdf897ea5c

diff --cc packaging/webapi-plugins.spec
index bb0ae9ca7fe44f0ba30c8ad3cf4f031f13b07fc4,48dd7eea3e3754bede5889d511b832148975d64e..10d57c00f9690f30996c0a3515127c9bb5de8a9a
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -8,7 -10,7 +8,7 @@@
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
  
  Name:       webapi-plugins
--Version:    1.83
++Version:    1.84
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries

diff --cc src/convergence/convergence_remote_app_control_service.cc
Simple merge