Merge branch 'tizen_5.0' into tizen_5.5

Change-Id: I4e6eafdfe9c3fc56deed4d50b0a99c08ab877bb6

diff --cc packaging/webapi-plugins.spec
index 096e2df10ac3fc26bebf41e7d7d7fbd9d244e4eb,f83fcdb6dd404bce83017d8ae25a1c7707b75469..99d41bfe4a0c4d37b8cb5e96a6112fe1bcbdd6cf
--- 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.61
 -Version:    2.48
++Version:    2.62
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries

diff --cc src/alarm/alarm_manager.cc
Simple merge