Merge branch 'tizen_3.0' into tizen

Change-Id: I760ff213dc53919d95f68dfa8de503505ce1a932

diff --cc packaging/webapi-plugins.spec
index ffe891af7cb458737f848fd607b51cc9e0308719,e823e279f8fc5f6008edf5dbfe6f2c841784ffbf..03ea01921445120a6930efad3174d4584c7423b2
--- 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.88
++Version:    1.89
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries

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

diff --cc src/systeminfo/systeminfo_api.js
Simple merge