Merge branch 'tizen_5.0' into tizen_5.5

Change-Id: I813db4cffb3862ced142c7a94e62679259f53c6d

diff --cc packaging/webapi-plugins.spec
index c54c948,9da348d..79244b4
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -6,11 -6,9 +6,11 @@@
  %define crosswalk_extensions tizen-extensions-crosswalk
  
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
 +%define tizen_ut_build 0
 +
  
  Name:       webapi-plugins
- Version:    2.68
 -Version:    2.52
++Version:    2.69
  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/js/file_stream.js
Simple merge