Merge branch 'tizen_4.0' into tizen 11/173611/3 tizen_5.0 submit/tizen/20180329.080913 submit/tizen/20180402.130428 submit/tizen/20180831.124001 submit/tizen/20180831.162406 submit/tizen/20180921.133538 submit/tizen/20180921.171241 submit/tizen_5.0/20181101.000009
authorVikas Kumar Agrawal <vikas.ag@samsung.com>
Thu, 22 Mar 2018 13:19:43 +0000 (18:49 +0530)
committerVikas Kumar Agrawal <vikas.ag@samsung.com>
Fri, 23 Mar 2018 08:31:50 +0000 (14:01 +0530)
commit02bb4aa37a100ed64cc7b1182212a8c5f5a504f7
tree0b44dd0bf758d4b708716d9af2aa2855a78092e7
parent070a62fd1af08ffcd1f5e1c317501a7761f282ec
parentad70d3d5f87172f35f4fd8dc14ce0f979597e44c
Merge branch 'tizen_4.0' into tizen

Conflicts:
src/common/file-operation/mf-request.c
src/common/file-system/mf-file-attr.c
src/common/mf-callback.c
src/common/mf-detail.c
src/common/mf-file-util.c
src/common/mf-fm-svc-wrapper.c
src/common/mf-launch.c
src/common/mf-media-content.c
src/common/mf-otg.c
src/common/mf-storage-space.c
src/common/mf-ug-detail-fs.c
src/common/mf-util.c
src/media-db/mf-media-db.c
src/media-db/mf-media.c
src/mf-main.c
src/thumbnail/mf-thumb-gen.c
src/widget/mf-category-view.c
src/widget/mf-detail-view.c
src/widget/mf-edit-view.c
src/widget/mf-gengrid.c
src/widget/mf-genlist.c
src/widget/mf-navi-bar.c
src/widget/mf-object-item.c
src/widget/mf-object.c
src/widget/mf-popup.c
src/widget/mf-root-view.c
src/widget/mf-search-bar.c
src/widget/mf-search-view.c
src/widget/mf-tray-item.c
src/widget/mf-view.c

Change-Id: I081420aa5631a02b00402b93f1fdb859805ec743
29 files changed:
src/common/file-system/mf-file-attr.c
src/common/mf-callback.c
src/common/mf-detail.c
src/common/mf-file-util.c
src/common/mf-fm-svc-wrapper.c
src/common/mf-launch.c
src/common/mf-media-content.c
src/common/mf-otg.c
src/common/mf-storage-space.c
src/common/mf-ug-detail-fs.c
src/common/mf-util.c
src/media-db/mf-media-db.c
src/media-db/mf-media.c
src/mf-main.c
src/thumbnail/mf-thumb-gen.c
src/widget/mf-category-view.c
src/widget/mf-detail-view.c
src/widget/mf-edit-view.c
src/widget/mf-gengrid.c
src/widget/mf-genlist.c
src/widget/mf-navi-bar.c
src/widget/mf-object-item.c
src/widget/mf-object.c
src/widget/mf-popup.c
src/widget/mf-root-view.c
src/widget/mf-search-bar.c
src/widget/mf-search-view.c
src/widget/mf-tray-item.c
src/widget/mf-view.c