am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclair
am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclair

Merge commit '97fdd0aba93f7c609c1194edf636805ff70e4918'

* commit '97fdd0aba93f7c609c1194edf636805ff70e4918':
  Add Emergency Calls Only String.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base