Merge commit 'd55c31ead6e52b215f42f351761483386ecacbc2' into eclair-mr2-plus-aosp
* commit 'd55c31ead6e52b215f42f351761483386ecacbc2':
b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-mr2
* commit '4d004e910732565ddd449c7c525f7d6cbd353392':
b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
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-mr2
* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Merge commit '2b42f028f7250f86590a8c39f2ce29936f960b7a' into eclair-mr2-plus-aosp
* commit '2b42f028f7250f86590a8c39f2ce29936f960b7a':
Import revised translations. DO NOT MERGE
Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-mr2
* commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a':
Import revised translations. DO NOT MERGE
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 '7bb19a892cdf94d017a2046b374f977d47d20597' into eclair-mr2-plus-aosp
* commit '7bb19a892cdf94d017a2046b374f977d47d20597':
Import revised translations. DO NOT MERGE
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 '17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-mr2
* commit '17fcd476643e27943f548415e49e1be7d8e74ac1':
Import revised translations. DO NOT MERGE
Merge commit 'acfc96f1504ffa01fcdf78e9ff3c91917a9401c1' into eclair-mr2-plus-aosp
* commit 'acfc96f1504ffa01fcdf78e9ff3c91917a9401c1':
Don't restore old brightness when cancelling brightness dialog in automatic mode.
Merge commit '53dcdeeb85e523e0b752d802d3413f5d4001d575' into eclair-mr2
* commit '53dcdeeb85e523e0b752d802d3413f5d4001d575':
Don't restore old brightness when cancelling brightness dialog in automatic mode.
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.
Fixes a problem that could result in the backlight getting set to a bogus brightness
level if you open the dialog and cancel when in automatic mode.
Bug b/2015734
Change-Id: I302697e4ebd37afcdbfdd74ba0b1cc9be27ee40b
Signed-off-by: Mike Lockwood <lockwood@android.com>
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 '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 '0bc64d45b418c70dca77a74ddbea62612ae4fe19' into eclair-mr2-plus-aosp
* commit '0bc64d45b418c70dca77a74ddbea62612ae4fe19':
Add a intent extra to only show the access points in the settings menu.
