Merge branch 'tizen_3.0' into tizen_4.0 95/190495/1
authorPiotr Kosko <p.kosko@samsung.com>
Tue, 2 Oct 2018 12:11:27 +0000 (14:11 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Tue, 2 Oct 2018 12:11:27 +0000 (14:11 +0200)
commita32d2fe3bc4c691a6e75edd942fffd71be1acddc
tree1782a394d45f20b40147f2d582179d54c3b53136
parent087ebb8beb015bbd45af8f87fa268b2c3b0cbeca
parente93a64e5dfdb5a1ce0dc6854c1b6739c5fd6ae2f
Merge branch 'tizen_3.0' into tizen_4.0

Change-Id: Iaff2d9c208f5291dfac1eacb23070b8c4f3f10f2
packaging/webapi-plugins.spec
src/archive/zip_add_request.cc
src/exif/jpeg_file.cc
src/humanactivitymonitor/humanactivitymonitor_manager.cc