OSDN Git Service

am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into...
authorAmith Yamasani <yamasani@google.com>
Fri, 9 Aug 2013 00:31:23 +0000 (17:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Aug 2013 00:31:23 +0000 (17:31 -0700)
commitd04e36e6f2259747dac4c4a1fa0393f72dc078af
tree6df77e31c768e44fd14172aca115a007c3f18815
parent1eb6105f25dcecde565f9d56e5c87feed7bd520d
parent2f219c51ad2151c9d31912d836276679e0dd747d
am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev

* commit '2f219c51ad2151c9d31912d836276679e0dd747d':
  Fix inconsistent text in Settings>Security>Screen lock