Merge branch 'tizen_3.0' into tizen_4.0 22/168422/1 accepted/tizen/4.0/unified/20180131.050338 submit/tizen_4.0/20180126.102411
authorPiotr Kosko <p.kosko@samsung.com>
Fri, 26 Jan 2018 10:10:36 +0000 (11:10 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Fri, 26 Jan 2018 10:10:36 +0000 (11:10 +0100)
commitcd1c34159467ade993b575a633e78c52134bbab5
treed254fdd5fbc91c6512c77037931b514597805046
parent0f376b82154b662dbb3a43f82251c22a2af4c210
parentf0d174fe3affd1d5dead0f3c4517a36ae86aa557
Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
src/download/download_instance.cc

Change-Id: I58ad10dac86b0a93074499fc839b30dd365b0f59
packaging/webapi-plugins.spec
src/download/download_instance.cc
src/humanactivitymonitor/humanactivitymonitor_manager.cc
src/utils/utils_api.js