OSDN Git Service

Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
authorAmith Yamasani <yamasani@google.com>
Fri, 9 Aug 2013 00:28:48 +0000 (00:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Aug 2013 00:28:49 +0000 (00:28 +0000)
commit2f219c51ad2151c9d31912d836276679e0dd747d
treecd944ba0c7bf87a74f3e76ebc2955c912baf4871
parenta42cacb34b8b6a5c9c0fd1b6c1ba63a121658d6f
parentdef5e5eb06a0ded7ddd85ff57fa8028badce0778
Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
res/values/strings.xml