tree a94551eee8341b95d10a0b206b0b0cba1f851b51
parent 11832db437d04d71dec9a78382138b2dd6518e37
parent b06be57f0acf8bb7b8c1767604058c8f061a7b8b
author Jim Miller <jaggies@google.com> 1340040749 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340040749 -0700

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

* commit 'b06be57f0acf8bb7b8c1767604058c8f061a7b8b':
  Fix 6507787: fix MMI PUK unlock procedure