tree 27e975fb6a1d9312c6624a09b830b7c37b42df7a
parent 041982bf50b3ce4a26170c52c732f328f519f650
parent 5250db0bfd18aacbb6406212a84e3dd101e547e6
author Jim Miller <jaggies@google.com> 1340041768 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340041768 -0700

am 5250db0b: am b06be57f: Merge "Fix 6507787: fix MMI PUK unlock procedure" into jb-dev

* commit '5250db0bfd18aacbb6406212a84e3dd101e547e6':
  Fix 6507787: fix MMI PUK unlock procedure