Merge commit '60037611a4f4bd9f2a724f9076abb17f553c6bb9' into eclair-mr2-plus-aosp
* commit '60037611a4f4bd9f2a724f9076abb17f553c6bb9':
Import revised translations. DO NOT MERGE
Merge commit '35a4c327a94272d7bd1ec5c575e787ea3d5364cc'
* commit '35a4c327a94272d7bd1ec5c575e787ea3d5364cc':
Add backup string for a platform setting to enable or disable
Merge commit 'dd1f7c9e64b9614f5fe3fff9edf4343ee82ab48b' into eclair-mr2-plus-aosp
* commit 'dd1f7c9e64b9614f5fe3fff9edf4343ee82ab48b':
Add backup string for a platform setting to enable or disable
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp
* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-mr2
* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-plus-aosp
* commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a':
Import revised translations. DO NOT MERGE
Merge commit '69b4dec040eaf5f4984aa0128c75328e0b1b5efc'
* commit '69b4dec040eaf5f4984aa0128c75328e0b1b5efc':
b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit '8c591405074da2b1f8c5e51ef23b5507fb83fc98'
* commit '8c591405074da2b1f8c5e51ef23b5507fb83fc98':
Fix for 1974140. Delete entry if not valid on hitting home.
Merge commit '8b643d946222119cf15b0d5d9d9cf7cd4fe019c1' into eclair-mr2-plus-aosp
* commit '8b643d946222119cf15b0d5d9d9cf7cd4fe019c1':
b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e' into eclair-mr2-plus-aosp
* commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e':
Fix for 1974140. Delete entry if not valid on hitting home.
Merge commit '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-mr2
* commit '0cb3743e93aef81e7669f1e6c81184559e0f8154':
b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-mr2
* commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
Fix for 1974140. Delete entry if not valid on hitting home.
Merge commit '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-plus-aosp
* commit '0cb3743e93aef81e7669f1e6c81184559e0f8154':
b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-plus-aosp
* commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
Fix for 1974140. Delete entry if not valid on hitting home.
Merge commit '4f75cca2cdc828fef6c09f3afea57e9ae771c0a2'
* commit '4f75cca2cdc828fef6c09f3afea57e9ae771c0a2':
Use consistent punctuation for the Chinese locale names.
Merge commit 'afed5fca00f781c5356cb1cf2ed7ee7f6326dc4c'
* commit 'afed5fca00f781c5356cb1cf2ed7ee7f6326dc4c':
Add Authentication Type field to the APN settings.
Merge commit '17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-plus-aosp
* commit '17fcd476643e27943f548415e49e1be7d8e74ac1':
Import revised translations. DO NOT MERGE
If user doesn't enter an APN or name, then delete the entry on hitting home.
And if user has enough information but doesn't enter a name, then set the
name to "Untitled" to avoid blank APNs in the list.
Merge commit 'a4ec838d12c94b7103a4b3882ecda4ba28f6567b' into eclair-mr2-plus-aosp
* commit 'a4ec838d12c94b7103a4b3882ecda4ba28f6567b':
Use consistent punctuation for the Chinese locale names.
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 'f0fed9dc8784f0635cd27c498beecc45e1f800be' into eclair-mr2-plus-aosp
* commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be':
Fix for 2202408: Replace Never Timeout with 30 minutes
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-mr2
* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
Fix for 2202408: Replace Never Timeout with 30 minutes
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-plus-aosp
* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
Fix for 2202408: Replace Never Timeout with 30 minutes
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.
