Merge branch 'tizen_4.0' into tizen_5.0

Change-Id: I6307aead894899f049bacde9cb8af54febe91251

diff --cc packaging/webapi-plugins.spec
index b555e02,5db3100..a8e2c23
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -8,7 -8,7 +8,7 @@@
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
  
  Name:       webapi-plugins
- Version:    2.39
 -Version:    2.35
++Version:    2.40
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries

diff --cc src/filesystem/filesystem_instance.cc
Simple merge

diff --cc src/filesystem/filesystem_instance.h
Simple merge

diff --cc src/filesystem/filesystem_manager.cc
Simple merge

diff --cc src/filesystem/filesystem_manager.h
Simple merge

diff --cc src/filesystem/js/common.js
Simple merge