[ABS] Merge branch 'tizen_dev' into tizen

Reference: submit/tizen/20160915.113254
Commit id: e6a02d99913abb171d35f5691a433c1112cb775c
Requested by: and.klimenko@samsung.com
SDK rootstrap version: 20160913_3

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-arm-debug.tpk b/org.tizen.ug-lockscreen-options-1.0.0-arm-debug.tpk
index 2d47af58e834bb3af6d1c8d588ed4d2215f2b9b8..829d186e6bf4cc284f1ad7466d43a8e7d83b5e10 100644 (file)
Binary files a/org.tizen.ug-lockscreen-options-1.0.0-arm-debug.tpk and b/org.tizen.ug-lockscreen-options-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-arm.tpk b/org.tizen.ug-lockscreen-options-1.0.0-arm.tpk
index 64581500c2a3106e6b497666456a56c23c2147f9..5d9c04fbc42ae8d866826c395d23bdd1dd620329 100644 (file)
Binary files a/org.tizen.ug-lockscreen-options-1.0.0-arm.tpk and b/org.tizen.ug-lockscreen-options-1.0.0-arm.tpk differ

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-i386-debug.tpk b/org.tizen.ug-lockscreen-options-1.0.0-i386-debug.tpk
index 539b3782829c7c92430a1dc65957fa059e0f542c..34857dd4eea3d65bb40fba59f03d0798f8054678 100644 (file)
Binary files a/org.tizen.ug-lockscreen-options-1.0.0-i386-debug.tpk and b/org.tizen.ug-lockscreen-options-1.0.0-i386-debug.tpk differ

diff --git a/org.tizen.ug-lockscreen-options-1.0.0-i386.tpk b/org.tizen.ug-lockscreen-options-1.0.0-i386.tpk
index ff377bf995800377eea981916db3d71203d309af..197c8f9f5b5ae0bf5bfdfb2b327ad49072ff3f36 100644 (file)
Binary files a/org.tizen.ug-lockscreen-options-1.0.0-i386.tpk and b/org.tizen.ug-lockscreen-options-1.0.0-i386.tpk differ

diff --git a/packaging/org.tizen.ug-lockscreen-options.spec b/packaging/org.tizen.ug-lockscreen-options.spec
index d7300fe83d40a31174b47d99bb6b04f8a8adcff6..1bd44818520b9b122269bb5c2321d4947cb007bf 100644 (file)
--- a/packaging/org.tizen.ug-lockscreen-options.spec
+++ b/packaging/org.tizen.ug-lockscreen-options.spec
@@ -1,6 +1,6 @@
 Name:       org.tizen.ug-lockscreen-options
-#VCS_FROM:   profile/mobile/apps/native/ug-lockscreen-setting-efl#30b56ee11981781f7978e94f852e69d9c3f8ba1d
-#RS_Ver:    20160913_2 
+#VCS_FROM:   profile/mobile/apps/native/ug-lockscreen-setting-efl#e6a02d99913abb171d35f5691a433c1112cb775c
+#RS_Ver:    20160913_3 
 Summary:    Settings of lockscreen-application
 Version:    1.0.0
 Release:    1
@@ -28,7 +28,7 @@ Requires(post):  /usr/bin/tpk-backend
 %endif
 
 %description
-profile/mobile/apps/native/ug-lockscreen-setting-efl#30b56ee11981781f7978e94f852e69d9c3f8ba1d
+profile/mobile/apps/native/ug-lockscreen-setting-efl#e6a02d99913abb171d35f5691a433c1112cb775c
 This is a container package which have preload TPK files
 
 %prep