tree b777d05f982d2880dab1fe2196a0f0f43ff3e78f
parent 16261b0fe6bf7048a2d70658a3103aa8fb15156c
parent c76e9bd3e9643e29c846df5d14bbd59420ee6776
author Jim Miller <jaggies@google.com> 1321397947 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321397947 -0800

am 390811b8: am b35a21f9: Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1

* commit '390811b8a4a08703b32d4d36bc6997798b52d341':
  Fix 5602985: Show "Emergency calls only" when device has no SIM.