summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2010-01-27 17:26:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-27 17:26:40 -0800
commitf83ef4ee4f6d2cca0ffcb1ceeb3c977ee98e8b58 (patch)
treeb9b8be6cf5b834c61cf78f81e0ced17370f06a8a
parent4ccc94b9561b3b1206a62598c4fe0e81b5576cdf (diff)
parentb119686b3d423527136b2fc14c5b47f2e7ae4992 (diff)
downloadframeworks_native-f83ef4ee4f6d2cca0ffcb1ceeb3c977ee98e8b58.zip
frameworks_native-f83ef4ee4f6d2cca0ffcb1ceeb3c977ee98e8b58.tar.gz
frameworks_native-f83ef4ee4f6d2cca0ffcb1ceeb3c977ee98e8b58.tar.bz2
am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclair
Merge commit '97fdd0aba93f7c609c1194edf636805ff70e4918' * commit '97fdd0aba93f7c609c1194edf636805ff70e4918': Add Emergency Calls Only String.
0 files changed, 0 insertions, 0 deletions