Merge commit 'f69e5ad5372fbeef76f191f22e6d65202f9c782f'
* commit 'f69e5ad5372fbeef76f191f22e6d65202f9c782f':
b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
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 '4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-plus-aosp
* commit '4d004e910732565ddd449c7c525f7d6cbd353392':
b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
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 '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 '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 '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 '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-plus-aosp
* commit '0cb3743e93aef81e7669f1e6c81184559e0f8154':
b/2219381 Gray out Bluetooth Settings for the emulator
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.
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