tree 1cd987f87027ba7cd099f058c7066d9d684614f1
parent cfd46dc4847d5ef1ed14484717cf857ae5f67cae
parent 2598fbd71a2109ab307d32935a13fa1eab150e8d
author Jim Miller <jaggies@google.com> 1395277723 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277723 +0000

am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev

* commit '2598fbd71a2109ab307d32935a13fa1eab150e8d':
  Attempt to fix a bug where SIM progress dialog gets stuck.