Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-mr2
* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
Use consistent punctuation for the Chinese locale names.
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-mr2
* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
Add Authentication Type field to the APN settings.
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 '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-mr2
* commit '8355d9343455eaacf559f0df0e752f236b7464d2':
Import revised translations. DO NOT MERGE
Merge commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-mr2
* commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141
The extracted bits will move into the HTC vendor tree, and it (or
similar settings for other vendors) can be accessed via a generic
OEM_RADIO_INFO activity.
Addresses issue:
http://buganizer/issue?id=1645706
Change-Id: Iec5461bcb3e241a1230f5f6d53baa3bb838ff4a9
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-mr2
* commit '9f1900dc05773a0659030e21a8c2fa1641655669':
Fix issue #2185893: Can not install 3D Media Gallery
Merge commit '9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-mr2
* commit '9ef9801f6f42d25b7e539262ebfec428546107fc':
Import revised translations. DO NOT MERGE
Merge commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-mr2
* commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
Show an error message when the remote side cancels the authentication
Merge commit '0512f51f21901e4a3f3f60aba82e3bb87ab0cc72' into eclair
* commit '0512f51f21901e4a3f3f60aba82e3bb87ab0cc72':
Import revised translations. DO NOT MERGE
Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-mr2
* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
Import revised translations. DO NOT MERGE
Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-mr2
* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
Add L2tpIpsec case in VpnSettings.processSecrets()