[ABS] Merge branch 'tizen_dev' into tizen

Reference: submit/tizen/20160913.133936
Commit id: 30b56ee11981781f7978e94f852e69d9c3f8ba1d
Requested by: and.klimenko@samsung.com
SDK rootstrap version: 20160913_2

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 60fbd12e2ca94c0cafb74d25d76f3b7cdb197dfa..2d47af58e834bb3af6d1c8d588ed4d2215f2b9b8 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 9db4e6f824c526091c3e7376751c4023eb5147ee..64581500c2a3106e6b497666456a56c23c2147f9 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 6934e170f29be32a6d6cc1c76c3ccc213bf49710..539b3782829c7c92430a1dc65957fa059e0f542c 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 9cdec7ab3265d64e8d1bc2ba15675a1b801cf989..ff377bf995800377eea981916db3d71203d309af 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 ef22a5efdccb512482423e125f5e14e42682b506..d7300fe83d40a31174b47d99bb6b04f8a8adcff6 100644 (file)
--- a/packaging/org.tizen.ug-lockscreen-options.spec
+++ b/packaging/org.tizen.ug-lockscreen-options.spec
@@ -1,5 +1,5 @@
 Name:       org.tizen.ug-lockscreen-options
-#VCS_FROM:   profile/mobile/apps/native/ug-lockscreen-setting-efl#6bae179c3953fc7b49eac2dba83a3a2d1d8f62b0
+#VCS_FROM:   profile/mobile/apps/native/ug-lockscreen-setting-efl#30b56ee11981781f7978e94f852e69d9c3f8ba1d
 #RS_Ver:    20160913_2 
 Summary:    Settings of lockscreen-application
 Version:    1.0.0
@@ -28,7 +28,7 @@ Requires(post):  /usr/bin/tpk-backend
 %endif
 
 %description
-profile/mobile/apps/native/ug-lockscreen-setting-efl#6bae179c3953fc7b49eac2dba83a3a2d1d8f62b0
+profile/mobile/apps/native/ug-lockscreen-setting-efl#30b56ee11981781f7978e94f852e69d9c3f8ba1d
 This is a container package which have preload TPK files
 
 %prep