From: Igor Olshevskyi <i.olshevskyi@samsung.com>
Date: Mon, 17 Jul 2017 07:25:22 +0000 (+0900)
Subject: [ABS] Merge branch 'tizen_dev' into tizen
X-Git-Tag: submit/tizen_unified_tpk/20170717.072234^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9e9b2fa327d8597a5d9b62e39b4b094b4c76298;p=profile%2Fwearable%2Fapps%2Fnative%2Fcall-ui.git

[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 a9020f0..7b9ee27 100644
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 c567641..562ce6b 100644
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 a939b74..4adae66 100644
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 a6d390f..517da4d 100644
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 9427eec..c17edb7 100644
--- 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