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

diff --git a/org.tizen.myfile-1.0.0-arm-debug.tpk b/org.tizen.myfile-1.0.0-arm-debug.tpk
index 61a86886a8ebbb4204d2c9dadc60bec73b65ca82..b9fff63c4e94ead40e4a3710e470e349a31b135e 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 5b8048ec6020f8cab0105a517ea0f7bcbdfc86ee..6fe387ac156ca06829c646d0347fa6a034cc0cc2 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 1868834a5838f9ce747e39d1d4fe575430b3e7d6..f79f5b07a58b3f546d7543cee983cc5d9ff70f5f 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 398cb20c133161824316cf1a3433e7f98574463d..f46bf97f3f8ee1ccffef4e6fa7a8a17db374ecef 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 46742dcf0005954dd3697c9167c8901d7510de05..39e09dcd94fbb5feef13f561ee507964aea6c358 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:    20180328_4 
+#RS_Ver:    20180402_1 
 Summary:    Myfile Application v1.0
 Version:    1.0.0
 Release:    1