Merge branch 'tizen_3.0' into tizen_4.0 04/158804/1
authorPiotr Kosko <p.kosko@samsung.com>
Thu, 2 Nov 2017 13:39:09 +0000 (14:39 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Thu, 2 Nov 2017 13:39:09 +0000 (14:39 +0100)
commitdc72490dd3f867e4497bedec5a19b62d8a740837
treedec21765eb66f6533ae8830e48e43d6246527f66
parent00533882624e1fb7bc6b8c121630401224c18e84
parentfeb4fd71c2ea8e8a7440f7e5942c097748e524e4
Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
src/application/application_manager.cc
src/exif/exif_gps_location.cc
src/exif/rational.cc
src/humanactivitymonitor/humanactivitymonitor_instance.cc
src/nfc/nfc_util.cc
src/notification/notification_instance.cc
src/notification/notification_manager.cc
src/notification/status_notification.cc
src/systeminfo/systeminfo_manager.cc
src/systeminfo/systeminfo_properties_manager.cc

Change-Id: I1e6dffb7fb8bc7a088b55a18bee700887550d03f
39 files changed:
src/alarm/alarm_instance.cc
src/alarm/alarm_manager.cc
src/alarm/alarm_utils.cc
src/application/application_instance.cc
src/application/application_manager.cc
src/archive/archive_callback_data.cc
src/archive/archive_file.cc
src/archive/archive_instance.cc
src/archive/filesystem_node.cc
src/archive/un_zip.cc
src/archive/un_zip_extract_request.cc
src/archive/zip_add_request.cc
src/common/extension.cc
src/common/filesystem/filesystem_storage.cc
src/common/filter-utils.cc
src/common/platform_result.cc
src/common/tools.cc
src/datacontrol/datacontrol_instance.cc
src/download/download_instance.cc
src/exif/exif_information.cc
src/exif/exif_util.cc
src/exif/jpeg_file.cc
src/exif/rational.cc
src/filesystem/filesystem_file.cc
src/filesystem/filesystem_manager.cc
src/filesystem/filesystem_stat.cc
src/humanactivitymonitor/humanactivitymonitor_instance.cc
src/humanactivitymonitor/humanactivitymonitor_manager.cc
src/nfc/nfc_adapter.cc
src/nfc/nfc_instance.cc
src/nfc/nfc_util.cc
src/notification/notification_instance.cc
src/notification/notification_manager.cc
src/notification/status_notification.cc
src/sensor/sensor_api.js
src/sensor/sensor_service.cc
src/systeminfo/systeminfo_device_capability.cc
src/systeminfo/systeminfo_manager.cc
src/systeminfo/systeminfo_properties_manager.cc