Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-mr2
* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
Use consistent punctuation for the Chinese locale names.
Merge commit '760b45c2a688876b94383561163244de8086f1c6' into eclair-mr2-plus-aosp
* commit '760b45c2a688876b94383561163244de8086f1c6':
Add Authentication Type field to the APN settings.
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-mr2
* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
Add Authentication Type field to the APN settings.
Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-plus-aosp
* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
Use consistent punctuation for the Chinese locale names.
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-plus-aosp
* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
Add Authentication Type field to the APN settings.
Merge commit '32ac210016615fa6f0ee43ad5ffbc6d68ce75fab'
* commit '32ac210016615fa6f0ee43ad5ffbc6d68ce75fab':
Fix for 2202408: Replace Never Timeout with 30 minutes
Merge commit 'c342f093453c077bfbd5b7a78c9f0c46c39ad271'
* commit 'c342f093453c077bfbd5b7a78c9f0c46c39ad271':
Minor change to use defined key rather than a string.
Merge commit '0a4ab1eab20d5492bf7c87e348fd26d6c56889b9' into eclair-mr2-plus-aosp
* commit '0a4ab1eab20d5492bf7c87e348fd26d6c56889b9':
Disable Save of empty-named AP.
Merge commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be' into eclair-mr2-plus-aosp
* commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be':
Fix for 2202408: Replace Never Timeout with 30 minutes
Merge commit 'eb48882e18ba9b1241a4d79c0cd45d6994b6dec6' into eclair-mr2-plus-aosp
* commit 'eb48882e18ba9b1241a4d79c0cd45d6994b6dec6':
Minor change to use defined key rather than a string.
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-mr2
* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
Fix for 2202408: Replace Never Timeout with 30 minutes
Merge commit '62d3407de4a843cb83397fa757bc89653d78c800' into eclair-mr2
* commit '62d3407de4a843cb83397fa757bc89653d78c800':
Minor change to use defined key rather than a string.
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-plus-aosp
* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
Fix for 2202408: Replace Never Timeout with 30 minutes
Merge commit '62d3407de4a843cb83397fa757bc89653d78c800' into eclair-plus-aosp
* commit '62d3407de4a843cb83397fa757bc89653d78c800':
Minor change to use defined key rather than a string.
Merge commit '83ee51b4858bfdef133cbb2d103a0d5a3c635ab1'
* commit '83ee51b4858bfdef133cbb2d103a0d5a3c635ab1':
Add a intent extra to only show the access points in the settings menu.
Merge commit '0bc64d45b418c70dca77a74ddbea62612ae4fe19' into eclair-mr2-plus-aosp
* commit '0bc64d45b418c70dca77a74ddbea62612ae4fe19':
Add a intent extra to only show the access points in the settings menu.
Merge commit 'e304b9f4f7f5bf07522fcc05615d172abd6c52a3' into eclair-plus-aosp
* commit 'e304b9f4f7f5bf07522fcc05615d172abd6c52a3':
Add a intent extra to only show the access points in the settings menu.
Merge commit '53250b3aa8c85adb31bfe9db30907f72acab7103' into eclair-mr2-plus-aosp
* commit '53250b3aa8c85adb31bfe9db30907f72acab7103':
Import revised translations. DO NOT MERGE
Merge commit '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-mr2
* commit '8355d9343455eaacf559f0df0e752f236b7464d2':
Import revised translations. DO NOT MERGE
Merge commit '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-plus-aosp
* commit '8355d9343455eaacf559f0df0e752f236b7464d2':
Import revised translations. DO NOT MERGE
Merge commit '28309905ad2bcaff26d6773b2a20399296196e2e'
* commit '28309905ad2bcaff26d6773b2a20399296196e2e':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141
Merge commit '8e10261e87cf4b474cde0acb5fd837272e8c147e' into eclair-mr2-plus-aosp
* commit '8e10261e87cf4b474cde0acb5fd837272e8c147e':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141
Merge commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-plus-aosp
* commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141
Merge commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-mr2
* commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141