tree 461edec444001be946c216980f063708b3137b90
parent 70511ade47f75160bdfbf0693145a4b827294136
parent a3c7c35873235486787d58fa8310eebd87508bc9
author Irfan Sheriff <isheriff@google.com> 1323482947 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323482947 -0800

am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1

* commit 'a3c7c35873235486787d58fa8310eebd87508bc9':
  Handle emergency call back mode correctly