tree 3e13b604cbbd76a33fd36b83bd1517bde88957ed
parent 66e66e1d70bdcf184a29bc5eb8cfdeecffdb799f
parent 7a286d8391a58637e6834f4de296bf66183ce1b2
author Jim Miller <jaggies@google.com> 1326400267 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326400267 -0800

am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1

* commit '7a286d8391a58637e6834f4de296bf66183ce1b2':
  Fix 5620754: don't show pattern screen after SIM PUK unlock