[ABS] Merge branch 'tizen_4.0' into tizen accepted/tizen/unified/20180921.143137 submit/tizen_mobile_tpk/20180921.171241
authorVikas Kumar Agrawal <vikas.ag@samsung.com>
Fri, 21 Sep 2018 09:22:07 +0000 (18:22 +0900)
committerVikas Kumar Agrawal <vikas.ag@samsung.com>
Fri, 21 Sep 2018 09:22:07 +0000 (18:22 +0900)
commitcc6714b37daaeaf39e84da36a2f975847f17aece
treef453569a128891e4ae76a4bdb14520a6b0e6dc07
parentac83043838694d5b4ac63ecb650f8f70fa97dc50
[ABS] 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

Reference: submit/tizen/20180921.171241
Commit id: 02bb4aa37a100ed64cc7b1182212a8c5f5a504f7
Requested by: vikas.ag@samsung.com
SDK rootstrap version: 20180920_3
org.tizen.myfile-1.0.0-arm-debug.tpk
org.tizen.myfile-1.0.0-arm.tpk
org.tizen.myfile-1.0.0-x86-debug.tpk
org.tizen.myfile-1.0.0-x86.tpk
packaging/org.tizen.myfile.spec