From: Jinjin Shi Date: Fri, 21 Dec 2012 13:03:39 +0000 (+0800) Subject: Merge branch 'master' into tizen_2.0 X-Git-Tag: 2.1b_release~2^2~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3846878fb2e4ab0920a06d28976ce6d46d46d76;p=apps%2Fcore%2Fpreloaded%2Flockscreen.git Merge branch 'master' into tizen_2.0 Change-Id: Id3a84c2f9fd78b23dc494c73344d2716612f0e9c --- f3846878fb2e4ab0920a06d28976ce6d46d46d76