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

Merge commit '89fec7b155981d6e99eb1e05793f343a5d04aa59'

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

2010-01-28 10:47:27 -08:00

..

java

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

2010-01-28 10:47:27 -08:00

tests/telephonytests

Moving framework core tests closer to their source files.

2010-01-27 13:36:38 -08:00