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 '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 'e304b9f4f7f5bf07522fcc05615d172abd6c52a3' into eclair-plus-aosp
* commit 'e304b9f4f7f5bf07522fcc05615d172abd6c52a3':
Add a intent extra to only show the access points in the settings menu.
Merge commit '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-plus-aosp
* commit '8355d9343455eaacf559f0df0e752f236b7464d2':
Import revised translations. DO NOT MERGE
Merge commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-plus-aosp
* commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Change-Id: I1850549f513e3541b5761aae28ebc615410377de
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '9f1900dc05773a0659030e21a8c2fa1641655669' into eclair-plus-aosp
* commit '9f1900dc05773a0659030e21a8c2fa1641655669':
Fix issue #2185893: Can not install 3D Media Gallery
Merge commit '9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-plus-aosp
* commit '9ef9801f6f42d25b7e539262ebfec428546107fc':
Import revised translations. DO NOT MERGE
Merge commit '0512f51f21901e4a3f3f60aba82e3bb87ab0cc72' into eclair
* commit '0512f51f21901e4a3f3f60aba82e3bb87ab0cc72':
Import revised translations. DO NOT MERGE
Merge commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-plus-aosp
* commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
Show an error message when the remote side cancels the authentication
Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-plus-aosp
* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
Import revised translations. DO NOT MERGE
Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-plus-aosp
* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
Add L2tpIpsec case in VpnSettings.processSecrets()
Merge commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-plus-aosp
* commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff':
Add the auth_alg field back.
Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-plus-aosp
* commit '6de9fb390b9eab0dbaf9709db5149eefc18724da':
Import revised translations. DO NOT MERGE
Merge commit '6e6d2362ccd119e51839a4f306c26783f634ab15' into eclair-plus-aosp
* commit '6e6d2362ccd119e51839a4f306c26783f634ab15':
Check if a device is added to the cache before returning.
Merge commit '9767612cc8207f906173dc9459b45cd07d881c4e' into eclair-plus-aosp
* commit '9767612cc8207f906173dc9459b45cd07d881c4e':
SecuritySettings: fix a the status before handling the intent.
Merge commit 'e61a2403a64bd711dcf3abb36594eb6545601c80' into eclair-plus-aosp
* commit 'e61a2403a64bd711dcf3abb36594eb6545601c80':
SecuritySettings: set the check box before further processing.
Merge commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f' into eclair-plus-aosp
* commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f':
WifiSettings: use keystore namespace instead of blobl.
This change is to fix the issue http://b/issue?id=2161539.
The auth_alg field is required for auth. type 'SHARED' with WEP mode, it will
not be automatically selected as claimed. The change has been verified on
Linksys WRT54G.