[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/20180831.162406
Commit id: 02bb4aa37a100ed64cc7b1182212a8c5f5a504f7
Requested by: vikas.ag@samsung.com
SDK rootstrap version: 20180831_1

diff --git a/org.tizen.myfile-1.0.0-arm-debug.tpk b/org.tizen.myfile-1.0.0-arm-debug.tpk
index b9fff63c4e94ead40e4a3710e470e349a31b135e..27730d7867d3fdb8e9bc3262f2b872189642e5fd 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-arm-debug.tpk and b/org.tizen.myfile-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.myfile-1.0.0-arm.tpk b/org.tizen.myfile-1.0.0-arm.tpk
index 6fe387ac156ca06829c646d0347fa6a034cc0cc2..3f984fc552b5f06437cf3df7de11c486f83296ef 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-arm.tpk and b/org.tizen.myfile-1.0.0-arm.tpk differ

diff --git a/org.tizen.myfile-1.0.0-x86-debug.tpk b/org.tizen.myfile-1.0.0-x86-debug.tpk
index f79f5b07a58b3f546d7543cee983cc5d9ff70f5f..119554a9c9d172ec29064b006cb7ef0336801f0e 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-x86-debug.tpk and b/org.tizen.myfile-1.0.0-x86-debug.tpk differ

diff --git a/org.tizen.myfile-1.0.0-x86.tpk b/org.tizen.myfile-1.0.0-x86.tpk
index f46bf97f3f8ee1ccffef4e6fa7a8a17db374ecef..bbf2fcedaac763dd4d9a53349b69a8a330ab8b02 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-x86.tpk and b/org.tizen.myfile-1.0.0-x86.tpk differ

diff --git a/packaging/org.tizen.myfile.spec b/packaging/org.tizen.myfile.spec
index 39e09dcd94fbb5feef13f561ee507964aea6c358..7bf4025c7f5e1b35bbd4c15ca6d0383857695649 100644 (file)
--- a/packaging/org.tizen.myfile.spec
+++ b/packaging/org.tizen.myfile.spec
@@ -1,6 +1,6 @@
 Name:       org.tizen.myfile
 #VCS_FROM:   profile/mobile/apps/native/myfiles#02bb4aa37a100ed64cc7b1182212a8c5f5a504f7
-#RS_Ver:    20180402_1 
+#RS_Ver:    20180831_1
 Summary:    Myfile Application v1.0
 Version:    1.0.0
 Release:    1