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
Reference: submit/tizen/
20180402.130428
Commit id:
02bb4aa37a100ed64cc7b1182212a8c5f5a504f7
Requested by: vikas.ag@samsung.com
SDK rootstrap version: 20180402_1