Merge branch 'tizen_3.0' into tizen_4.0

Change-Id: Ib0a0675b868f145f94825b3b209ed779e648df73

diff --cc packaging/webapi-plugins.spec
Simple merge

diff --cc src/humanactivitymonitor/humanactivitymonitor_manager.cc
index ba187c1,1dc5779..d8d0d84
--- 1/src/humanactivitymonitor/humanactivitymonitor_manager.cc
--- 2/src/humanactivitymonitor/humanactivitymonitor_manager.cc
+++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
@@@ -269,9 -269,10 +269,10 @@@ class HumanActivityMonitorManager::Moni
    class GestureMonitor;
    class SensorMonitor;
    class GpsMonitor;
+   class PedometerMonitor;
  
    explicit Monitor(const std::string& t) : type_(t) {
 -    ScopeLogger(type());
 +    ScopeLogger("type %s", type().c_str());
    }
  
    virtual ~Monitor() {
@@@ -533,12 -534,12 +534,12 @@@ class HumanActivityMonitorManager::Moni
    SensorMonitor(const std::string& t, sensor_type_e s, const SensorEventConverter& c,
                  const SensorRecordedConverter& r)
        : Monitor(t),
-         sensor_(s),
-         handle_(nullptr),
          converter_(c),
          converter_recorded_(r),
+         sensor_(s),
+         handle_(nullptr),
          recorded_data_(nullptr) {
 -    ScopeLogger(type());
 +    ScopeLogger("type %s", type().c_str());
    }
  
    virtual ~SensorMonitor() override {