am 89fec7b1: am 098295a5: Merge "Updated emergency string when locale changes." into eclair

Merge commit '89fec7b155981d6e99eb1e05793f343a5d04aa59'

* commit '89fec7b155981d6e99eb1e05793f343a5d04aa59':
  Updated emergency string when locale changes.