Merge branch 'tizen_4.0' into tizen

voice control temporally disabled until voice-control package will be synchronized

Change-Id: I2106ffe625259361cb5db18207742b66d80a5716
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>

diff --cc packaging/webapi-plugins.spec
index ea2275c,16d1fe6..1d34ae0
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -157,6 -159,8 +159,8 @@@ Source0:    %{name}-%{version}.tar.g
  
  %define tizen_mobile_feature_tvinputdevice_support           0
  
 -%define tizen_mobile_feature_voicecontrol_support            1
++%define tizen_mobile_feature_voicecontrol_support            0
+ %define tizen_mobile_feature_ppm_support                     1
  
  ####################################################################
  #       Wearable Profile :  B2 / TW2                      #
@@@ -233,6 -236,9 +236,9 @@@
  %define tizen_wearable_feature_inputdevice_support             1
  %define tizen_wearable_feature_tvinputdevice_support           0
  
 -%define tizen_wearable_feature_voicecontrol_support            1
++%define tizen_wearable_feature_voicecontrol_support            0
+ %define tizen_wearable_feature_ppm_support                     1
+ 
  
  ####################################################################
  #       TV Profile                                                 #
@@@ -287,6 -293,8 +293,8 @@@
  %define tizen_tv_feature_wi_fi_support                   1
  %define tizen_tv_feature_inputdevice_support             0
  %define tizen_tv_feature_tvinputdevice_support           1
 -%define tizen_tv_feature_voicecontrol_support            1
++%define tizen_tv_feature_voicecontrol_support            0
+ %define tizen_tv_feature_ppm_support                     0
  
  # common, or "unified (undefined)"
  %define unified_build   1