Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/download/download_instance.cc

Change-Id: I58ad10dac86b0a93074499fc839b30dd365b0f59

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

diff --cc src/download/download_instance.cc
index 4662cbf89d2ec6b9a26d4cdf88c9f0cae986aaf6,fda4c5749994d1fdbbcf214970602abf61702f27..722123f285d8f90978c58abd2a3924aa16796961
--- 1/src/download/download_instance.cc
--- 2/src/download/download_instance.cc
+++ b/src/download/download_instance.cc
@@@ -196,10 -194,10 +196,11 @@@ void DownloadInstance::OnStateChanged(i
      return;
    }
  
 -  downCbPtr->state = state;
 -  downCbPtr->downloadId = download_id;
 +  down_cb_ptr->state = state;
 +  down_cb_ptr->native_download_id = download_id;
  
-   SLoggerD("State for callbackId %d changed to %d", down_cb_ptr->download_id, static_cast<int>(state));
 -  SLoggerD("State for callbackId %d changed to %d", downCbPtr->callbackId, static_cast<int>(state));
++  SLoggerD("State for callbackId %d changed to %d", down_cb_ptr->download_id,
++           static_cast<int>(state));
  
    switch (state) {
      case DOWNLOAD_STATE_NONE:

diff --cc src/humanactivitymonitor/humanactivitymonitor_manager.cc
Simple merge

diff --cc src/utils/utils_api.js
Simple merge