summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2010-01-21 14:06:35 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-21 14:06:35 -0800
commitb119686b3d423527136b2fc14c5b47f2e7ae4992 (patch)
treef4d901d22f470e7d421cde73033da6a191f7db17
parent72f98a93148b0a95970f34e5d72d49ca789e83b2 (diff)
parent402dce24532419cf39a1c960654b5db96d1276e3 (diff)
downloadframeworks_native-b119686b3d423527136b2fc14c5b47f2e7ae4992.zip
frameworks_native-b119686b3d423527136b2fc14c5b47f2e7ae4992.tar.gz
frameworks_native-b119686b3d423527136b2fc14c5b47f2e7ae4992.tar.bz2
am 7f70998d: Merge "Add Emergency Calls Only String." into eclair
Merge commit '7f70998dec6d7db850373b7e75677ecf72904878' into eclair-plus-aosp * commit '7f70998dec6d7db850373b7e75677ecf72904878': Add Emergency Calls Only String.
0 files changed, 0 insertions, 0 deletions