OSDN Git Service

am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
authorJohn Wang <johnwang@google.com>
Wed, 8 Jun 2011 21:46:04 +0000 (14:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jun 2011 21:46:04 +0000 (14:46 -0700)
commitde13001f765e30bc29a3a74bfa751cc42e426a93
tree11d6e274523a5eb77f06c7658cc3cd793a70e2c6
parentb539f8d7d53895bdc461c957b832dcc8e2df9096
parent1f8665895f71904b9d757854277cb637841356c3
am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE

* commit '1f8665895f71904b9d757854277cb637841356c3':
  Add SIM PUK unlockscreen.
core/java/com/android/internal/widget/LockPatternUtils.java
core/res/res/values/config.xml
core/res/res/values/strings.xml