Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/humanactivitymonitor/humanactivitymonitor_manager.cc

Change-Id: I782f99a7d436a786ee41d6fb0e37f4404e401813

diff --cc src/humanactivitymonitor/humanactivitymonitor_manager.cc
index 1d27e70,9a52f2f..ba187c1
--- 1/src/humanactivitymonitor/humanactivitymonitor_manager.cc
--- 2/src/humanactivitymonitor/humanactivitymonitor_manager.cc
+++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
@@@ -1371,8 -1371,8 +1371,8 @@@ HumanActivityMonitorManager::HumanActiv
        return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "To few values of HRM event");
      }
  
 -    LOGGER(DEBUG) << "  |- values[0][HR ]: " << event->values[0];
 -    LOGGER(DEBUG) << "  |- values[2][RRI]: " << event->values[2];
 +    LoggerD("|- values[0][HR ]: %f", event->values[0]);
-     LoggerD("|- values[1][RRI]: %f", event->values[1]);
++    LoggerD("|- values[2][RRI]: %f", event->values[2]);
  
      float hr = floor(event->values[0] + 0.5);  // heart beat rate 0 ~ 220 integer (bpm)