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)
1  2 
res/values/strings.xml

Simple merge