John Wang 97fdd0aba9 am 7f70998d: Merge "Add Emergency Calls Only String." into eclair ...

Merge commit '7f70998dec6d7db850373b7e75677ecf72904878' into eclair-plus-aosp

* commit '7f70998dec6d7db850373b7e75677ecf72904878':
  Add Emergency Calls Only String.

2010-01-21 14:06:35 -08:00

..

config

…

java

am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair

2010-01-21 12:28:08 -08:00

jni

am a66baccc: Merge "Do not merge" into eclair

2010-01-20 18:35:24 -08:00

res

Add Emergency Calls Only String.

2010-01-21 12:46:01 -08:00