[ABS] Merge branch 'tizen_dev' into tizen

Conflicts:
	tizen-manifest.xml

Reference: submit/tizen/20170717.072234
Commit id: c272af9fde05c98ab1f285ca67ed35d4f2ce3aac
Requested by: i.olshevskyi@samsung.com
SDK rootstrap version: 20170714_3

diff --git a/org.tizen.w-call-ui-1.0.0-arm-debug.tpk b/org.tizen.w-call-ui-1.0.0-arm-debug.tpk
index a9020f05139774a74488b323649023a4a13868f0..7b9ee27a953c81e0871308e770412a5a7202c20b 100644 (file)
Binary files a/org.tizen.w-call-ui-1.0.0-arm-debug.tpk and b/org.tizen.w-call-ui-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.w-call-ui-1.0.0-arm.tpk b/org.tizen.w-call-ui-1.0.0-arm.tpk
index c5676411b603b45560a2a23d02f970f004e322f8..562ce6b8ce75491817592dfb04606e9edc0a6971 100644 (file)
Binary files a/org.tizen.w-call-ui-1.0.0-arm.tpk and b/org.tizen.w-call-ui-1.0.0-arm.tpk differ

diff --git a/org.tizen.w-call-ui-1.0.0-x86-debug.tpk b/org.tizen.w-call-ui-1.0.0-x86-debug.tpk
index a939b74a278c593e3699820faf2aaa3059f44819..4adae665629ec0918d3f83a06d89a70bb924b069 100644 (file)
Binary files a/org.tizen.w-call-ui-1.0.0-x86-debug.tpk and b/org.tizen.w-call-ui-1.0.0-x86-debug.tpk differ

diff --git a/org.tizen.w-call-ui-1.0.0-x86.tpk b/org.tizen.w-call-ui-1.0.0-x86.tpk
index a6d390f6d34e22d0b28f22240786e71d3f38944d..517da4d3ca1ced2d96fd2d09048cb49502cd8712 100644 (file)
Binary files a/org.tizen.w-call-ui-1.0.0-x86.tpk and b/org.tizen.w-call-ui-1.0.0-x86.tpk differ

diff --git a/packaging/org.tizen.w-call-ui.spec b/packaging/org.tizen.w-call-ui.spec
index 9427eec96976c5ca737e01329683d050c6bb20db..c17edb7dcd5979e1297e0498659a8797b156afc1 100644 (file)
--- a/packaging/org.tizen.w-call-ui.spec
+++ b/packaging/org.tizen.w-call-ui.spec
@@ -1,6 +1,6 @@
 Name:       org.tizen.w-call-ui
 #VCS_FROM:   profile/wearable/apps/native/call-ui#c272af9fde05c98ab1f285ca67ed35d4f2ce3aac
-#RS_Ver:    20170703_1 
+#RS_Ver:    20170714_3 
 Summary:    w-call-ui
 Version:    1.0.0
 Release:    1