Commit ae42882e authored Nov 17, 2011 by Jim Miller Committed by Android Git Automerger Nov 17, 2011

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

* commit '398f80eacb8e59d868f287bf273a1253fe219ce4':
  Fix 5620754: don't show pattern screen after SIM PUK unlock

There are no changes