OSDN Git Service

am 0b92eb4b: am 1aff11be: am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen...
authorJim Miller <jaggies@google.com>
Thu, 12 Jan 2012 21:41:00 +0000 (13:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Jan 2012 21:41:00 +0000 (13:41 -0800)
commit1c99b24a518c7d314553e45395d4395f8b0008b0
tree55b97842be7f16d95c900294374a2a2a41f6bc27
parent6af3c9d5a764155d832d2bed8b1a81a7d75fedf3
parent5bd7c88fc7a51296e814d420aa96133a1ae7a426
am 0b92eb4b: am 1aff11be: am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1

* commit '0b92eb4b8c2cfd1230245e387424df19ae0535d9':
  Fix 5620754: don't show pattern screen after SIM PUK unlock